Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 Sep 2009 15:02:24 +0000 (16:02 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 Sep 2009 15:02:30 +0000 (16:02 +0100)
commit28f9f19db9dda54c851d5689539d86f6fc008773
tree469f5d7b24871b6fe001b7ad9acac859405f4822
parent40262b2b6efac507005a2c981175266bf81152a7
parent52a7a1cec88acdaf3f8b36a6b1fe904f6eca7ee5
Merge branch 'devel' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
MAINTAINERS
arch/arm/include/asm/cputype.h
drivers/net/irda/pxaficp_ir.c
sound/arm/pxa2xx-ac97.c