]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
commit4ab1056766a4e49f6b9ef324313dd1583f8f8f4e
tree89f975e7e021dd27dc807e45445e963aeb39fcda
parent4175160b065e74572819a320dcd34129224a4e1c
parent4cdfc2ec72e940abb4322aa1bc14f43a1486fc5d
Merge branch 'v3-removal' into for-linus

Conflicts:
arch/arm/boot/compressed/head.S
arch/arm/boot/compressed/head.S
arch/arm/mm/fault.c