android_kernel_xiaomi_sm8350/arch/arm/mach-footbridge
Russell King 3f30a09a61 Merge branch 'pxa-all' into devel
Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/include/mach/hardware.h
	arch/arm/mach-pxa/spitz.c
2008-10-09 21:33:02 +01:00
..
include/mach
cats-hw.c
cats-pci.c
common.c
common.h
dc21285-timer.c
dc21285.c
dma.c
ebsa285-leds.c
ebsa285-pci.c
ebsa285.c
isa-irq.c Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
isa-timer.c
isa.c
Kconfig
Makefile
Makefile.boot
netwinder-hw.c
netwinder-leds.c
netwinder-pci.c
personal-pci.c
personal.c
time.c Merge branch 'ptebits' into devel 2008-10-09 21:31:56 +01:00