Merge branch 'drivers-platform' into release

Browse Source

Conflicts:
	drivers/misc/Kconfig

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

...

This commit is contained in:

Len Brown

2009-01-09 04:01:26 -05:00

parent ec9f168fcc b4f9fe1215

commit d97c0defba

25 changed files with 409 additions and 382 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

6948

drivers/platform/x86/thinkpad_acpi.c Normal file

File diff suppressed because it is too large Load Diff