Merge git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci
authorJames Bottomley <JBottomley@Parallels.com>
Sun, 3 Jul 2011 19:19:29 +0000 (14:19 -0500)
committerJames Bottomley <JBottomley@Parallels.com>
Sun, 3 Jul 2011 19:19:29 +0000 (14:19 -0500)

Trivial merge