Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

Browse source

...

This commit is contained in:

Linus Torvalds 2005-06-22 23:18:10 -07:00

parent 060de20e82 d377e85b53

commit ee98689be1

2 changed files with 4 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

drivers/base/bus.c

View file

4

drivers/usb/input/hid-core.c

View file