Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung
commit1bf1aacedcda23c75e70fa3394e1caa6d4b5ee49
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Oct 2011 07:44:40 +0000 (23 10:44 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Oct 2011 07:44:40 +0000 (23 10:44 +0300)
tree3628287c740b7150f2808b89b4305a811778acab
parent5117cc25fd43add94c04c9d2ace713c69a21bdb1
parentfb630b9fc902e24209166b1659a8b375bf38099c
Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung

* '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