Merge tag 'samsung-drivers' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene...
authorOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 18:26:31 +0000 (11:26 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 18:26:31 +0000 (11:26 -0700)
commit687fb3c8a0d36c50434fe1b66c5f4fe9161e5983
tree56e62ba4c4e22390a03a1faba086c87c2d3ff0f4
parentcf460cde7c72283708cd494cf7feb4203f72c748
parenta83784859ccde07ebdc3a7acfbb2f74cb6c75a80
Merge tag 'samsung-drivers' of git./linux/kernel/git/kgene/linux-samsung into next/cleanup

Samsung drivers update for v3.15 from Kukjin Kim:
- remove inclusion <asm/mach/time.h> from exynos_mct.c
- remove inclusion <asm/mach/irq.h> from exynos-combiner.c
  and use calling handle_bad_irq() instead of do_bad_IRQ()

* tag 'samsung-drivers' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  irqchip: exynos-combiner: call handle_bad_irq directly
  clocksource: exynos_mct: remove unwanted header file inclusion

Signed-off-by: Olof Johansson <olof@lixom.net>