projects / platform / kernel / linux-stable.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4175160 4cdfc2e)
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 patch | diff1 | diff2 | blob | history
arch/arm/mm/fault.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/boot/compressed/head.S
Simple merge
diff --cc arch/arm/mm/fault.c
Simple merge
Domain: System / Kernel;