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

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

diff --cc arch/arm/mach-pxa/balloon3.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x300.c
Simple merge

diff --cc arch/arm/mach-pxa/colibri-pxa270-income.c
Simple merge

diff --cc arch/arm/mach-pxa/corgi.c
Simple merge

diff --cc arch/arm/mach-pxa/devices.c
Simple merge

diff --cc arch/arm/mach-pxa/em-x270.c
Simple merge

diff --cc arch/arm/mach-pxa/ezx.c
Simple merge

diff --cc arch/arm/mach-pxa/littleton.c
Simple merge

diff --cc arch/arm/mach-pxa/magician.c
Simple merge

diff --cc arch/arm/mach-pxa/mainstone.c
Simple merge

diff --cc arch/arm/mach-pxa/mioa701.c
Simple merge

diff --cc arch/arm/mach-pxa/palm27x.c
Simple merge

diff --cc arch/arm/mach-pxa/palmz72.c
Simple merge

diff --cc arch/arm/mach-pxa/pcm990-baseboard.c
Simple merge

diff --cc arch/arm/mach-pxa/poodle.c
Simple merge

diff --cc arch/arm/mach-pxa/raumfeld.c
Simple merge

diff --cc arch/arm/mach-pxa/saar.c
Simple merge

diff --cc arch/arm/mach-pxa/spitz.c
Simple merge

diff --cc arch/arm/mach-pxa/tosa.c
index 5ad3807,93a8903..5fa1457
--- 1/arch/arm/mach-pxa/tosa.c
--- 2/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>

diff --cc arch/arm/mach-pxa/trizeps4.c
Simple merge

diff --cc arch/arm/mach-pxa/viper.c
Simple merge

diff --cc arch/arm/mach-pxa/vpac270.c
Simple merge

diff --cc arch/arm/mach-pxa/z2.c
Simple merge

diff --cc arch/arm/mach-pxa/zeus.c
Simple merge

diff --cc drivers/ata/pata_palmld.c
Simple merge