]> Pileus Git - ~andy/linux/commitdiff
projects / ~andy / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c536a1 fbdd63d)
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 02:19:00 +0000 (11:19 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 02:19:00 +0000 (11:19 +0900)
Pull C6X UAPI disintegration from Mark Salter:

 - scripted UAPI disintegration by David Howells.

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  UAPI: (Scripted) Disintegrate arch/c6x/include/asm

1  2 
arch/c6x/include/asm/Kbuild patch | diff1 | diff2 | blob | history
arch/c6x/include/uapi/asm/unistd.h patch | diff1 | diff2 | blob | history

diff --cc arch/c6x/include/asm/Kbuild
Simple merge
diff --cc arch/c6x/include/uapi/asm/unistd.h
Simple merge
Andy's Linux Kernel repo