Merge branch 'master' into upstream

Browse source

...

This commit is contained in:

Jeff Garzik 2006-08-04 07:15:56 -04:00

parent fe2a24dfc5 efe78cda35

commit 6bbad18a8b

30 changed files with 179 additions and 169 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

13

drivers/acpi/dock.c

View file

7

drivers/char/snsc.c

View file

3

drivers/pci/hotplug/acpiphp_core.c

View file

2

drivers/pci/hotplug/acpiphp_glue.c

View file

38

drivers/pci/pcie/portdrv_pci.c

View file

7

drivers/pci/quirks.c

View file

2

drivers/pci/search.c

View file

12

drivers/pnp/interface.c

View file

10

drivers/scsi/ahci.c

View file