]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitda179886997cb81d6599543c25d9a3f6029c9d68
treec922f449e0ba26e225795684f2ef46954406c7c0
parent98d02069c54a026b51bcaed2006277c1c348850e
parentb8f96ff0ff360c7b230657b316d479dd58e05934
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
arch/powerpc/include/asm/ptrace.h
arch/powerpc/include/asm/unistd.h