Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Oct 2012 18:04:59 +0000 (11:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Oct 2012 18:04:59 +0000 (11:04 -0700)
commitfb06de04192c2d0ed18599e5a6402b85382fd8d5
tree25a3fc2343286f06d58bf69e22b4dfcbecd2ee27
parent22054fbe7adbdd6db5cc766912ac41ab20b016ef
parente1858b2a21cd84a855945a4747fb2db41b250c22
Merge branch 'for-linus' of git://git./linux/kernel/git/rkuo/linux-hexagon-kernel

Pull hexagon updates from Richard Kuo:
 "It includes the Hexagon UAPI changes from David Howells and some CR
  marking changes for the transition from Code Aurora to Linux
  Foundation."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
  Hexagon: Copyright marking changes
  UAPI: (Scripted) Disintegrate arch/hexagon/include/asm