Merge branch 'for-tony' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb...
authorTony Lindgren <tony@atomide.com>
Tue, 24 May 2011 07:04:49 +0000 (00:04 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 24 May 2011 07:04:49 +0000 (00:04 -0700)

Trivial merge