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

Conflicts:
	arch/arm/mach-mx3/mach-pcm037.c

diff --cc arch/arm/mach-mx3/mach-pcm037.c
index 034ec81,a550ae9..2df1ec5
--- 1/arch/arm/mach-mx3/mach-pcm037.c
--- 2/arch/arm/mach-mx3/mach-pcm037.c
+++ b/arch/arm/mach-mx3/mach-pcm037.c
@@@ -35,8 -35,6 +35,7 @@@
  #include <linux/can/platform/sja1000.h>
  #include <linux/usb/otg.h>
  #include <linux/usb/ulpi.h>
- #include <linux/fsl_devices.h>
 +#include <linux/gfp.h>
  
  #include <media/soc_camera.h>