Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Oct 2011 07:44:40 +0000 (10:44 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Oct 2011 07:44:40 +0000 (10:44 +0300)
* 'samsung-fixes-4' of git://github.com/kgene/linux-samsung:
  ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PM
  ARM: S5P: fix offset calculation on gpio-interrupt


Trivial merge