projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4fe19f fd3bc66)
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)
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

1  2 
arch/powerpc/include/asm/ptrace.h patch | diff1 | diff2 | blob | history
arch/powerpc/include/asm/unistd.h patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/include/asm/ptrace.h
Simple merge
diff --cc arch/powerpc/include/asm/unistd.h
Simple merge
Domain: System / Kernel;