| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f | [log] [tgz] |
|---|---|---|
| author | David Vrabel <david.vrabel@csr.com> | Mon Oct 20 16:07:19 2008 +0100 |
| committer | David Vrabel <david.vrabel@csr.com> | Mon Oct 20 16:07:19 2008 +0100 |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 | |
| parent | c15895ef30c2c03e99802951787183039a349d32 [diff] | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 [diff] |
Merge branch 'master' into for-upstream Conflicts: Documentation/ABI/testing/sysfs-bus-usb drivers/Makefile