]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Merge branch 'battery' into release
authorLen Brown <len.brown@intel.com>
Mon, 25 Oct 2010 06:12:57 +0000 (02:12 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 25 Oct 2010 06:12:57 +0000 (02:12 -0400)
1  2 
drivers/acpi/battery.c

Simple merge