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)
commitff69497ad754b0fa9d5935df644890f208f31558
tree6a7b51f507093363f37eb817bdee3d28465c0f9d
parent6c536a17fa049d0fb690c1a947b97dbfd304a916
parentfbdd63d76c5ad6ae56a7bd1acebabefafc6aadf0
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

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
arch/c6x/include/asm/Kbuild
arch/c6x/include/uapi/asm/unistd.h