tree c922f449e0ba26e225795684f2ef46954406c7c0
parent b4fe19f78e84813e720d0f0482da22194a7728e3
parent fd3bc66f1dd5d062b5f0a7afc90c69d8da5b42db
author Linus Torvalds <torvalds@linux-foundation.org> 1350094875 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1350094875 +0900

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