From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Nov 2009 15:46:05 +0000 (-0800)
Subject: Merge branch 'fixes-s3c-2632-rc5' of git://git.fluff.org/bjdooks/linux
X-Git-Tag: v2.6.32-rc6~6
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fcef24d38e8f974673d158866e60763ac4f2161b;p=linux-2.6-block.git

Merge branch 'fixes-s3c-2632-rc5' of git://git.fluff.org/bjdooks/linux

* 'fixes-s3c-2632-rc5' of git://git.fluff.org/bjdooks/linux:
  ARM: S3C2410: Fix sparse warnings in arch/arm/mach-s3c2410/gpio.c
  ARM: S3C2440: mini2440: Fix spare warnings
  ARM: S3C24XX: Fix warnings in arch/arm/plat-s3c24xx/gpio.c
  ARM: S3C2440: mini2440: Fix missing CONFIG_S3C_DEV_USB_HOST
  ARM: S3C24XX: arch/arm/plat-s3c24xx: Move dereference after NULL test
  ARM: S3C: Fix adc function exports
  ARM: S3C2410: Fix link if CONFIG_S3C2410_IOTIMING is not set
  ARM: S3C24XX: Introduce S3C2442B CPU
  ARM: S3C24XX: Define a macro to avoid compilation error
  ARM: S3C: Add info for supporting circular DMA buffers
  ARM: S3C64XX: Set rate of crystal mux
  ARM: S3C64XX: Fix S3C64XX_CLKDIV0_ARM_MASK value
---

fcef24d38e8f974673d158866e60763ac4f2161b