Merge tag 'openrisc-uapi' of git://openrisc.net/jonas/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 20:25:19 +0000 (13:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 20:25:19 +0000 (13:25 -0700)
Pull OpenRISC uapi disintegration from Jonas Bonn:
 "OpenRISC UAPI disintegration work from David Howells"

* tag 'openrisc-uapi' of git://openrisc.net/jonas/linux:
  UAPI: (Scripted) Disintegrate arch/openrisc/include/asm


Trivial merge