Merge tag 'disintegrate-parisc-20121016' into for-linus
authorJames Bottomley <JBottomley@Parallels.com>
Fri, 19 Oct 2012 17:26:06 +0000 (10:26 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Fri, 19 Oct 2012 17:26:06 +0000 (10:26 -0700)
UAPI Disintegration 2012-10-16

Signed-off-by: James Bottomley <JBottomley@Parallels.com>

Trivial merge