Merge 3.1-rc1 into usb-linus
commitb6741d1fe947f829bd4303397fd888e1d4b66bae
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 8 Aug 2011 04:08:28 +0000 (7 21:08 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 8 Aug 2011 04:08:41 +0000 (7 21:08 -0700)
treea41c8cf58ddfd82d3083b666479a82df018297f7
parentacab460b0f618e1e9663eea8c52ad5edd552ed1d
parent322a8b034003c0d46d39af85bf24fee27b902f48
Merge 3.1-rc1 into usb-linus

Gives us a good starting point to base patches off of.

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