From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 26 Mar 2011 10:03:03 +0000 (+0000)
Subject: Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa... 
X-Git-Tag: v2.6.39-rc2~40^2^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable

Conflicts:
	arch/arm/mach-pxa/tosa.c
---

938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e
diff --cc arch/arm/mach-pxa/tosa.c
index 5ad3807af3344,93a8903c3fedc..5fa145778e7d4
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@@ -34,7 -34,7 +34,8 @@@
  #include <linux/spi/spi.h>
  #include <linux/spi/pxa2xx_spi.h>
  #include <linux/input/matrix_keypad.h>
 +#include <linux/i2c/pxa-i2c.h>
+ #include <linux/usb/gpio_vbus.h>
  
  #include <asm/setup.h>
  #include <asm/mach-types.h>