Merge tag 'disintegrate-x86-20121214' of git://git.infradead.org/users/dhowells/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Dec 2012 23:48:52 +0000 (15:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Dec 2012 23:48:52 +0000 (15:48 -0800)
Pull x86 UAPI disintegration from David Howells.

This is the scripted disintegration of the uapi headers for x86, now
that most of the x86 updates for 3.8 are hopefully merged.

* tag 'disintegrate-x86-20121214' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: (Scripted) Disintegrate arch/x86/include/asm


Trivial merge