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)
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

Trivial merge