Merge tag 'uapi-20121219' into for-linus
authorJames Bottomley <JBottomley@Parallels.com>
Fri, 1 Mar 2013 09:08:44 +0000 (09:08 +0000)
committerJames Bottomley <JBottomley@Parallels.com>
Fri, 1 Mar 2013 09:08:44 +0000 (09:08 +0000)
UAPI Disintegration 2012-12-19

This is the remaining SCSI part of the UAPI

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

Trivial merge