Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 02:21:15 +0000 (11:21 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 02:21:15 +0000 (11:21 +0900)
commitb6897130f0ac8ac33043be736770eb5f58164044
treec922f449e0ba26e225795684f2ef46954406c7c0
parentb4fe19f78e84813e720d0f0482da22194a7728e3
parentfd3bc66f1dd5d062b5f0a7afc90c69d8da5b42db
Merge branch 'merge' of git://git./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
arch/powerpc/include/asm/ptrace.h
arch/powerpc/include/asm/unistd.h