From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 23 Oct 2011 07:44:40 +0000 (+0300)
Subject: Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung
X-Git-Tag: v3.1~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=1bf1aacedcda23c75e70fa3394e1caa6d4b5ee49;ds=sidebyside

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

1bf1aacedcda23c75e70fa3394e1caa6d4b5ee49