]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'battery' into release
authorLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:36:59 +0000 (03:36 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:36:59 +0000 (03:36 -0500)

Trivial merge