Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/mach-mx3/mach-mx31lilly.c
index b2c7f51,84942cf..8f66f65
--- 1/arch/arm/mach-mx3/mach-mx31lilly.c
--- 2/arch/arm/mach-mx3/mach-mx31lilly.c
+++ b/arch/arm/mach-mx3/mach-mx31lilly.c
@@@ -289,13 -273,9 +285,14 @@@ static struct spi_board_info mc13783_de
        .bus_num        = 1,
        .chip_select    = 0,
        .platform_data  = &mc13783_pdata,
+       .irq            = IOMUX_TO_IRQ(MX31_PIN_GPIO1_3),
  };
  
 +static struct platform_device *devices[] __initdata = {
 +      &smsc91x_device,
 +      &physmap_flash_device,
 +};
 +
  static int mx31lilly_baseboard;
  core_param(mx31lilly_baseboard, mx31lilly_baseboard, int, 0444);
  

diff --cc drivers/media/video/Kconfig
Simple merge

diff --cc drivers/usb/host/ehci-mxc.c
Simple merge