Merge tag 'v3.0-rc4' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
authorNicholas Bellinger <nab@linux-iscsi.org>
Thu, 23 Jun 2011 20:20:51 +0000 (20:20 +0000)
committerNicholas Bellinger <nab@linux-iscsi.org>
Thu, 23 Jun 2011 20:20:51 +0000 (20:20 +0000)

Trivial merge