tree 3628287c740b7150f2808b89b4305a811778acab
parent 5117cc25fd43add94c04c9d2ace713c69a21bdb1
parent fb630b9fc902e24209166b1659a8b375bf38099c
author Linus Torvalds <torvalds@linux-foundation.org> 1319355880 +0300
committer Linus Torvalds <torvalds@linux-foundation.org> 1319355880 +0300

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