Merge branch 'master' into upstream

Browse source

...

This commit is contained in:

Jeff Garzik 2006-09-11 09:05:33 -04:00

parent cff93eb3d3 38f5745c5a

commit 10e299fc6d

34 changed files with 202 additions and 291 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

2

drivers/ide/ide-proc.c

View file

2

drivers/ide/pci/sis5513.c

View file