]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 's3c64xx/multiplatform' into next/multiplatform
authorArnd Bergmann <arnd@arndb.de>
Tue, 15 Dec 2015 22:45:22 +0000 (23:45 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 15 Dec 2015 22:45:22 +0000 (23:45 +0100)
commit38169b7a6fbb561541847e689e37e8120f5246b6
tree65a27a478b52ac1208ff135009ea809c0dc5acdb
parentc3f058ed76dfb6bfa5a8f0efc302d12c9a77e082
parentd88270d2b409f53e7cf55baa027c7eb56a430258
Merge branch 's3c64xx/multiplatform' into next/multiplatform

* s3c64xx/multiplatform:
  ARM: s3c64xx: allow building without board support
  ARM: s3c64xx: multiplatform support
  ARM: s3c64xx: use common debug-ll implementation
  ARM: s3c64xx: use new adc/touchscreen driver
  iio: exynos-adc: add experimental touchscreen support
  ARM: s3c64xx: enable sparse IRQ support
  ARM: s3c64xx: prepare initcalls for multiplatform
  gpio: samsung: move gpio-samsung driver back to platform code
  ASoC: samsung/smartq: use dynamic registration
  Input: s3c2410_ts: fix S3C_ADC dependency

Conflicts:
arch/arm/Kconfig.debug
arch/arm/Kconfig.debug