summaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/adxl34x-i2c.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-05-24 10:14:57 +1000
committerDave Airlie <airlied@redhat.com>2013-05-24 10:14:57 +1000
commit80ce5f6f25bea86f4fbfb9c19c09e43ccac90bfd (patch)
tree112c57dea575d3ca3f83545d0150a16915d6abf2 /drivers/input/misc/adxl34x-i2c.c
parentc313d56754fee4eaed849f85a14044144bdd79c4 (diff)
parentdcb9a7c74acf59679a537e6fcc7a99c12353e7b8 (diff)
Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
Inki writes: This pull request includes drm_send_vblank_event() helper relevant patch I missed and code cleanups. And also it fixes a pended page flip issue. * 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: drm/exynos: replace request_threaded_irq with devm function drm/exynos: remove unnecessary devm_kfree drm/exynos: fix build warnings from ipp fimc drm/exynos: cleanup device pointer usages drm/exynos: wait for the completion of pending page flip drm/exynos: use drm_send_vblank_event() helper drm/exynos: page flip fixes drm/exynos: exynos_hdmi: Pass correct pointer to free_irq() drm/exynos: exynos_drm_ipp: Fix incorrect usage of IS_ERR_OR_NULL drm/exynos: exynos_drm_fbdev: Fix incorrect usage of IS_ERR_OR_NULL Conflicts: drivers/gpu/drm/exynos/exynos_hdmi.c
Diffstat (limited to 'drivers/input/misc/adxl34x-i2c.c')
0 files changed, 0 insertions, 0 deletions