Merge branch 'master' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 22 Sep 2009 19:54:53 +0000 (20:54 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 22 Sep 2009 20:01:40 +0000 (21:01 +0100)
commitae19ffbadc1b2100285a5b5b3d0a4e0a11390904
tree3c2086ab67398a019089a47ca3f362a4bc6db74f
parent34e84f39a27d059a3e6ec6e8b94aafa702e6f220
parent9173a8ef24a6b1b8031507b35b8ffe5f85a87692
Merge branch 'master' into for-linus
MAINTAINERS
arch/arm/kernel/vmlinux.lds.S
arch/arm/mach-pxa/spitz.c
drivers/rtc/rtc-sa1100.c