Merge branch 'master' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 8 Mar 2010 20:24:11 +0000 (20:24 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 8 Mar 2010 20:24:11 +0000 (20:24 +0000)
1  2 
arch/arm/boot/compressed/head.S
arch/arm/boot/compressed/vmlinux.lds.in

Simple merge