Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Apr 2011 00:36:45 +0000 (17:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Apr 2011 00:36:45 +0000 (17:36 -0700)
commit59c87de883d30289b82fa3f78e95a0d641f99fc4
tree6e5c314da1019f471754cceb8e2b5de7ac4e1db6
parenta78eda5cd3055852231ad10cfd047e65cb44dfde
parentbaab7307c7af963fbd993149d50dd45232b9d04c
Merge branch 's5p-fixes-for-linus' of git://git./linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: Fix warning 's3c_pm_show_resume_irqs' defined but not used
  ARM: SAMSUNG: Fix build failure in PM CRC check code
  ARM: S5P: Remove unused s3c_pm_check_resume_pin