diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-13 14:32:54 +0200 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-13 14:32:54 +0200 |
commit | dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c (patch) | |
tree | 4573b99fb11e5b93bd011045039b370ddafe45e6 /drivers/usb/host/isp1760-if.c | |
parent | ASoC: wm8731: Convert to devm_ functions (diff) | |
parent | Linux 3.4-rc7 (diff) | |
download | linux-dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c.tar.xz linux-dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c.zip |
Merge tag 'v3.4-rc7' into for-3.5
Linux 3.4-rc7
Conflicts):
drivers/base/regmap/regmap.c (overlap with bug fixes)
sound/soc/blackfin/bf5xx-ssm2602.c (overlap with bug fixes)
Diffstat (limited to 'drivers/usb/host/isp1760-if.c')
0 files changed, 0 insertions, 0 deletions