Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits)
  ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900
  ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline
  ARM: 6140/1: silence a bogus sparse warning in unwind.c
  ARM: mach-at91: duplicated include
  ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup
  ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup
  ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup
  ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup
  ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup
  ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup
  ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup
  ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup
  ARM: SPEAR6xx: remove duplicated #include
  ARM: s3c6400_defconfig: Add NAND driver
  ARM: s3c6400_defconfig: enable sound as modules
  ARM: s3c6400_defconfig: enable power management
  ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34
  ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34
  ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34
  ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34
  ...

diff --combined arch/arm/mach-mx3/mach-pcm037.c
index 78ecd75,5024284..cce4106
--- 1/arch/arm/mach-mx3/mach-pcm037.c
--- 2/arch/arm/mach-mx3/mach-pcm037.c
+++ b/arch/arm/mach-mx3/mach-pcm037.c
@@@ -449,6 -449,7 +449,7 @@@ static int __init pcm037_camera_alloc_d
  static struct platform_device *devices[] __initdata = {
        &pcm037_flash,
        &pcm037_sram_device,
+       &imx_wdt_device0,
        &pcm037_mt9t031,
        &pcm037_mt9v022,
  };
@@@ -530,9 -531,9 +531,9 @@@ static struct resource pcm970_sja1000_r
  };
  
  struct sja1000_platform_data pcm970_sja1000_platform_data = {
 -      .clock          = 16000000 / 2,
 -      .ocr            = 0x40 | 0x18,
 -      .cdr            = 0x40,
 +      .osc_freq       = 16000000,
 +      .ocr            = OCR_TX1_PULLDOWN | OCR_TX0_PUSHPULL,
 +      .cdr            = CDR_CBP,
  };
  
  static struct platform_device pcm970_sja1000 = {