Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
Russell King [Mon, 21 Sep 2009 15:02:24 +0000 (16:02 +0100)]
1  2 
MAINTAINERS
arch/arm/include/asm/cputype.h
drivers/net/irda/pxaficp_ir.c
sound/arm/pxa2xx-ac97.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge