Merge branch 'master' into for-linus
Russell King [Tue, 22 Sep 2009 19:54:53 +0000 (20:54 +0100)]
1  2 
MAINTAINERS
arch/arm/kernel/vmlinux.lds.S
arch/arm/mach-pxa/spitz.c
drivers/rtc/rtc-sa1100.c

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