Merge branch 'merge' into release-2.6.27

Browse source

...

This commit is contained in:

Andi Kleen 2008-07-18 01:43:31 +02:00

parent e1469c34eb ea51011a27

commit 97d2ef5686

3 changed files with 75 additions and 13 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

31

drivers/acpi/pci_link.c

View file

43

drivers/acpi/thermal.c

View file

14

drivers/acpi/video.c

View file