Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 26 Mar 2011 10:03:03 +0000 (10:03 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 26 Mar 2011 10:03:03 +0000 (10:03 +0000)
Conflicts:
arch/arm/mach-pxa/tosa.c

25 files changed:
1  2 
arch/arm/mach-pxa/balloon3.c
arch/arm/mach-pxa/cm-x300.c
arch/arm/mach-pxa/colibri-pxa270-income.c
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/devices.c
arch/arm/mach-pxa/em-x270.c
arch/arm/mach-pxa/ezx.c
arch/arm/mach-pxa/littleton.c
arch/arm/mach-pxa/magician.c
arch/arm/mach-pxa/mainstone.c
arch/arm/mach-pxa/mioa701.c
arch/arm/mach-pxa/palm27x.c
arch/arm/mach-pxa/palmz72.c
arch/arm/mach-pxa/pcm990-baseboard.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/raumfeld.c
arch/arm/mach-pxa/saar.c
arch/arm/mach-pxa/spitz.c
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/trizeps4.c
arch/arm/mach-pxa/viper.c
arch/arm/mach-pxa/vpac270.c
arch/arm/mach-pxa/z2.c
arch/arm/mach-pxa/zeus.c
drivers/ata/pata_palmld.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 5ad3807af33442a8c0812a23ea46b90ffcb0d144,93a8903c3fedc8896099a4ef9b60fd45a7650003..5fa145778e7d4b1a9e7a737b7292edc5c6715eb6
@@@ -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>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge