Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 6 Apr 2009 08:57:38 +0000 (09:57 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 6 Apr 2009 08:57:38 +0000 (09:57 +0100)
commit89de3820c7ae615345c093ae6fddac01f326fdc4
tree3e433ef080c3e1b691914a33d2d9e674f0744b47
parent3ef48fac6e8e2362a4e6ef31dd043c89fe107875
parent80748fb8ff3bc068dccacb690cd2eb417b034ec7
Merge branch 'devel' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6
MAINTAINERS
arch/arm/mach-pxa/magician.c