Russell King 7fecc34e07 Merge branch 'pxa-tosa' into pxa ... Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/tosa.c arch/arm/mach-pxa/spitz.c		2008-07-12 21:43:01 +01:00
..
aoa
arm
core
drivers
i2c
isa
mips
oss
parisc
pci
pcmcia
ppc
sh
soc	Merge branch 'pxa-tosa' into pxa	2008-07-12 21:43:01 +01:00
sparc
spi
synth
usb
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c
sound_firmware.c