| commit | 2cedcc4f122934c3ad38dfb2a400b98a62703e6d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 07 17:13:50 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 07 17:13:50 2010 -0800 |
| tree | dffa5daaf84cc7cd1a7e966ce4c6885e4dd974b9 | |
| parent | 6142e05f30b101adeafb0d12e35983f44f68233e [diff] | |
| parent | 812c4e40c27b6ea103ecfbf91d43654356629b81 [diff] |
Merge branch 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux
* 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux:
ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks
ARM: mini2440: Fix Kconfig to allow kernel to build
ARM: S3C2412: Fix typo in CONFIG_CPU_S3C2412_ONLY definition
ARM: S3C2443: Select properly ARM core type
ARM: SMDK2416: Select MACH_SMDK, S3C_DEV_NAND, S3C_DEV_USB_HOST