diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-04-30 09:57:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-04-30 09:57:46 +1000 |
| commit | 8b1f3dc8bbfe82de10836ae346a1c96c253e9f7f (patch) | |
| tree | ab5fe0acbfe94b9c37bfd641b2fb78fd6a384b82 /net/tipc/link.c | |
| parent | d8bf6b0d5aa403e9ca69ded9ddda3babd0a64d31 (diff) | |
| parent | 0377f4ed9f1aed30292c4e3c87f24e028ae26f36 (diff) | |
Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
This is final pull request for Exynos next and includes device tree
support for fimc device, one revert, some code cleanups and fixup.
The revert replaces wrong one[1] with correct one[2].
This was my mistake and sorry for this.
* 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
drm/exynos: Don't blend mixer layer 0
drm/exynos: Remove unnecessary braces in exynos_hdmi.c
drm/exynos: Select VIDEOMODE_HELPERS for FIMD
drm/exynos: do not use generic flags to dumb
drm/exynos: added ipp device registration to drm driver
exynos/drm: hdmi: cleanup for hdmi common device registration
drm/exynos: fix wrong return check for platform_device_register_simple
drm/exynos: add device tree support for fimc ipp driver
drm/exynos: rework fimc clocks handling
drm/exynos: remove redundant devm_kfree()
drm/exynos: enable FIMD clocks
Revert "drm/exynos: prepare FIMD clocks"
Diffstat (limited to 'net/tipc/link.c')
0 files changed, 0 insertions, 0 deletions