android_kernel_xiaomi_sm7250/arch/arm/mach-pxa
Russell King 53ffe3b440 [ARM] Merge most of the PXA work for initial merge
This includes PXA work up to the SPI changes for the initial merge,
since e172274ccc depends on the SPI
tree being merged.

Conflicts:

	arch/arm/configs/em_x270_defconfig
	arch/arm/configs/xm_x270_defconfig
2008-07-14 23:34:46 +01:00
..
akita-ioexp.c
clock.c
clock.h
cm-x270-pci.c
cm-x270-pci.h
cm-x270.c
colibri.c
corgi_lcd.c
corgi_pm.c
corgi_ssp.c
corgi.c
cpu-pxa.c
devices.c
devices.h
dma.c
e400_lcd.c
e740_lcd.c
e750_lcd.c
e800_lcd.c
em-x270.c
eseries_udc.c
eseries.c
ezx.c
generic.c
generic.h
gpio.c
gumstix.c
idp.c
irq.c
Kconfig
leds-idp.c
leds-lubbock.c
leds-mainstone.c
leds-trizeps4.c
leds.c
leds.h
littleton.c
lpd270.c
lubbock.c
magician.c
mainstone.c
Makefile
Makefile.boot
mfp-pxa2xx.c
mfp-pxa3xx.c
palmtx.c
pcm027.c
pcm990-baseboard.c
pm.c
poodle.c
pwm.c
pxa2xx.c
pxa3xx.c
pxa25x.c
pxa27x.c
pxa300.c
pxa320.c
pxa930.c
reset.c
saar.c
sharpsl_pm.c
sharpsl.h
sleep.S
smemc.c
spitz_pm.c
spitz.c
ssp.c
standby.S
tavorevb.c
time.c
tosa-bt.c
tosa.c
trizeps4.c
zylonite_pxa300.c
zylonite_pxa320.c
zylonite.c