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

Browse source

...

This commit is contained in:

Linus Torvalds 2006-01-14 10:42:40 -08:00

parent 3824ba7df9 9c08a938ce

commit 3e2b32b693

48 changed files with 358 additions and 256 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

3

include/linux/device.h

View file

5

include/linux/ide.h

View file