diff options
author | David Vrabel | 2008-10-20 17:07:19 +0200 |
---|---|---|
committer | David Vrabel | 2008-10-20 17:07:19 +0200 |
commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /CREDITS | |
parent | uwb: wrong sizeof argument in mac address compare (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
download | kernel-qcow2-linux-61e0e79ee3c609eb34edf2fe023708cba6a79b1f.tar.gz kernel-qcow2-linux-61e0e79ee3c609eb34edf2fe023708cba6a79b1f.tar.xz kernel-qcow2-linux-61e0e79ee3c609eb34edf2fe023708cba6a79b1f.zip |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions