aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-05-21 15:15:33 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-05-21 15:15:33 +0100
commit4ab1056766a4e49f6b9ef324313dd1583f8f8f4e (patch)
tree89f975e7e021dd27dc807e45445e963aeb39fcda /include
parent4175160b065e74572819a320dcd34129224a4e1c (diff)
parent4cdfc2ec72e940abb4322aa1bc14f43a1486fc5d (diff)
downloadlinux-4ab1056766a4e49f6b9ef324313dd1583f8f8f4e.tar.gz
Merge branch 'v3-removal' into for-linus
Conflicts: arch/arm/boot/compressed/head.S
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions