]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit99334a0745d90fe9e860369cb5b501b1714d659c
treefc0516369f4146595c5dce9bddda23d8691c3f42
parent1d81815ddf16a89fb41a406dcf95c40f956d295a
parente2e931299847341bc5abcff26ba9656fb67e19ea
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