Merge branches 'release' and 'menlo' into release

Browse Source

Conflicts:

	drivers/acpi/video.c

Signed-off-by: Len Brown <len.brown@intel.com>

...

This commit is contained in:

Len Brown

2008-02-07 03:18:04 -05:00

parent e5e54bc86a e5e54bc86a 3c60284052

commit 26b6f22366

19 changed files with 2455 additions and 175 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

drivers/acpi/thermal.c

+497 -159

File diff suppressed because it is too large Load Diff