Merge branch 'postmerge' into for-linus
authorJames Bottomley <JBottomley@Parallels.com>
Fri, 10 May 2013 14:54:01 +0000 (07:54 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Fri, 10 May 2013 14:54:01 +0000 (07:54 -0700)
commit297b8a07347555f0d2fafa4a1ddfc332d2d4afa9
tree7c54ce22c1cd10118b5094441b8d7da2f4c58d6a
parent832e77bc1106592c621fc42f2f6a4500e414a0a1
parent6df339a51e3bf18b868384bdeb31e49a4fbaa3d8
Merge branch 'postmerge' into for-linus

Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/sd.c