]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'v3-removal' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 May 2012 14:15:33 +0000 (15:15 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 May 2012 14:15:33 +0000 (15:15 +0100)
Conflicts:
arch/arm/boot/compressed/head.S

1  2 
arch/arm/boot/compressed/head.S
arch/arm/mm/fault.c

Simple merge
Simple merge