Merge branch 'usbhost17-for-mfd' of git://github.com/rogerq/linux into for-next
authorSamuel Ortiz <sameo@linux.intel.com>
Wed, 13 Feb 2013 23:27:29 +0000 (00:27 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Wed, 13 Feb 2013 23:27:34 +0000 (00:27 +0100)
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

Trivial merge