git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b87bb6 f25752e)
Merge branch 'ec' into release
authorLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:05:34 +0000 (02:05 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:05:34 +0000 (02:05 -0400)
Conflicts:
drivers/acpi/ec.c

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

Trivial merge
Pandora Kernel Repository