Merge branch 'usbhost_runtime_pm_14_devel_3.3' of git://git.pwsan.com/linux-2.6 into...
authorTony Lindgren <tony@atomide.com>
Fri, 16 Dec 2011 19:42:24 +0000 (11:42 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 16 Dec 2011 19:42:24 +0000 (11:42 -0800)

Trivial merge