Merge branch 'next-s3c24xx' into next-merged
authorBen Dooks <ben-linux@fluff.org>
Thu, 18 Dec 2008 14:52:00 +0000 (14:52 +0000)
committerBen Dooks <ben-linux@fluff.org>
Thu, 18 Dec 2008 14:52:00 +0000 (14:52 +0000)
commitc6ad115876763e4f15055982ecb9579cb7abab5f
tree75d2b0f5f31540ff8a2dcdde9e0f087b25c68868
parent1d19fdba149f4db055902c30b27adfb7d1ead058
parent28ab44c5be60a9b91021a7cc7b4e202775c04764
Merge branch 'next-s3c24xx' into next-merged
arch/arm/mach-s3c2440/Kconfig
arch/arm/plat-s3c24xx/Kconfig