diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-20 09:46:46 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-20 09:46:46 -0800 |
commit | 07058599b486fe342f371200ac4718fedbe9a354 (patch) | |
tree | 378ed4e3c1795014999cf9d5c3abd99426fcf4e7 /arch/arm/mach-netx/pfifo.c | |
parent | 7f8635cc9e66a26d7280ba680b044fa2f65104af (diff) | |
parent | cb1868869dce7b751b670aadfc1f1360bc224b29 (diff) | |
download | linux-stable-07058599b486fe342f371200ac4718fedbe9a354.tar.gz linux-stable-07058599b486fe342f371200ac4718fedbe9a354.tar.bz2 linux-stable-07058599b486fe342f371200ac4718fedbe9a354.zip |
Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S5PV210: update MAX8998 platform data to get rid of WARN()
ARM S3C24XX: Fix compilation of PM code for S3C2416
ARM: S3C24XX: Fix CONFIG_S3C_DEV_NAND Kconfig entry
Diffstat (limited to 'arch/arm/mach-netx/pfifo.c')
0 files changed, 0 insertions, 0 deletions