From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Dec 2010 01:13:50 +0000 (-0800)
Subject: Merge branch 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux
X-Git-Tag: v2.6.37-rc6~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2cedcc4f122934c3ad38dfb2a400b98a62703e6d;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

2cedcc4f122934c3ad38dfb2a400b98a62703e6d