diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 02:05:34 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 02:05:34 -0400 |
| commit | 762caf0baafc657c410b9c04f4a95d4e3aa4dda1 (patch) | |
| tree | 67f40220c61c2ad5ad7b1f063337942157c33027 /drivers/sh | |
| parent | 3b87bb640e77023c97cf209e3dd85887a1113ad0 (diff) | |
| parent | f25752e67d9d9ee7562ae9944314dd8c057d3fa2 (diff) | |
Merge branch 'ec' into release
Conflicts:
drivers/acpi/ec.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/sh')
0 files changed, 0 insertions, 0 deletions