Merge branch 'pxa-trizeps' into pxa-machines
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 7 Oct 2008 18:06:52 +0000 (19:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 7 Oct 2008 18:06:52 +0000 (19:06 +0100)
commit5ff7f78a3db462ea4edf1a781a2002d4e8a8a473
treefc0516369f4146595c5dce9bddda23d8691c3f42
parent35437b6192d9a4eb92f095dfd72396b6d2970f0b
parent92b797f6a1347623a41caf02516b70e5fa706a90
Merge branch 'pxa-trizeps' into pxa-machines

Conflicts:

drivers/pcmcia/Makefile
arch/arm/Kconfig
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/Makefile
drivers/pcmcia/Makefile