tree 516ad2f00670ddbe8a9a138c178d07260d1b44cf
parent 0030f65481338df4213b995a4310e643652acb82
parent ab3f2a86d17c5c2c1127871d28d1f64baebc5d04
author Samuel Ortiz <sameo@linux.intel.com> 1360798049 +0100
committer Samuel Ortiz <sameo@linux.intel.com> 1360798054 +0100

Merge branch 'usbhost17-for-mfd' of git://github.com/rogerq/linux into for-next

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>