Merge 3.1-rc1 into usb-linus
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 8 Aug 2011 04:08:28 +0000 (21:08 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 8 Aug 2011 04:08:41 +0000 (21:08 -0700)
Gives us a good starting point to base patches off of.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Trivial merge