From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 8 Apr 2010 09:47:05 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bb3c9d4f851d51bb6302ef0df830dcec88d7c529;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

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

bb3c9d4f851d51bb6302ef0df830dcec88d7c529
diff --cc arch/arm/mach-mx3/mach-pcm037.c
index 034ec8190065,a550ae9e1637..2df1ec55a97e
--- a/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>