Merge tag 'disintegrate-alpha-20121217' of git://git.infradead.org/users/dhowells...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Dec 2012 18:10:36 +0000 (10:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Dec 2012 18:10:36 +0000 (10:10 -0800)
commit3d9de1909b339f967f1b37367df233a0dcfc10cf
treeb2360a9ac142e15007ebe0fabf0365b9d4cd8b65
parent9a8a5702c5a7298c0edd125464aa178dd8b50440
parent96433f6ee49032d7a8bda76de2b05cfde2914354
Merge tag 'disintegrate-alpha-20121217' of git://git.infradead.org/users/dhowells/linux-headers

Pull UAPI disintegration for Alpha from David Howells:
 "I've been asked to send the Alpha UAPI disintegration to you directly.
  The acks I have been given have been added into the patch."

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