tree 2b226019e7b1344f05e44d79da956a5306d20780
parent e0fd9affeb64088eff407dfc98bbd3a5c17ea479
parent e689cf0caf2d5ebcb300fb69887d35c0abdbdb97
author James Bottomley <JBottomley@Parallels.com> 1368197620 -0700
committer James Bottomley <JBottomley@Parallels.com> 1368197620 -0700

Merge branch 'misc' into for-linus

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