Merge branch 'ec' into release

Browse source

Conflicts:
	drivers/acpi/ec.c

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

...

This commit is contained in:

Len Brown 2009-09-19 02:05:34 -04:00

parent 3b87bb640e f25752e67d

commit 762caf0baa

1 changed files with 50 additions and 100 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

150

drivers/acpi/ec.c

View file