summaryrefslogtreecommitdiff
path: root/arch/um/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-13 11:21:15 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-13 11:21:15 +0900
commitb6897130f0ac8ac33043be736770eb5f58164044 (patch)
treec922f449e0ba26e225795684f2ef46954406c7c0 /arch/um/kernel
parentb4fe19f78e84813e720d0f0482da22194a7728e3 (diff)
parentfd3bc66f1dd5d062b5f0a7afc90c69d8da5b42db (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc uapi disintegration from Benjamin Herrenschmidt. * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: UAPI: (Scripted) Disintegrate arch/powerpc/include/asm
Diffstat (limited to 'arch/um/kernel')
0 files changed, 0 insertions, 0 deletions