summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-04-23 23:05:16 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-04-23 23:05:16 +0200
commit6b7acae74fc2ffe6cfd7592e95ca933cadb31219 (patch)
treea3a1aa0aec02ffbf5d4b323869a81610f93094a4 /kernel
parentMerge branch 'devel-stable' into for-next (diff)
parentARM: Fix nommu booting (diff)
parentARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile (diff)
downloadlinux-6b7acae74fc2ffe6cfd7592e95ca933cadb31219.tar.xz
linux-6b7acae74fc2ffe6cfd7592e95ca933cadb31219.zip
Merge branches 'misc' and 'vdso' into for-next