tree 03a2be42314c424863b96553537bf24d6b03a211
parent 1dbd02ec389b11ffc6288695e13c5754e6e07847
parent 63f32b3893aba641504d744d58ab5ed6f528fc7c
author Arnd Bergmann <arnd@arndb.de> 1331050316 +0000
committer Arnd Bergmann <arnd@arndb.de> 1331050316 +0000

Merge branch 'v3.3-samsung-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

* 'v3.3-samsung-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: fix touchscreen IRQ setup on Universal C210 board
  ARM: S3C24XX: DMA resume regression fix
  ARM: S3C24XX: Fix restart on S3C2442
  ARM: SAMSUNG: Fix memory size for hsotg