]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branches 'apei', 'battery-mwh-fix', 'bugzilla-10807', 'bugzilla-14736', 'bugzil...
authorLen Brown <len.brown@intel.com>
Wed, 29 Sep 2010 19:18:28 +0000 (15:18 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 29 Sep 2010 19:18:28 +0000 (15:18 -0400)
commitfdb8c58a1671beb51949412e053926acd5500b5f
tree4b031ae9d9626aae31afe6f1da697bd7f1007897
parent23f124ca3dda98496b7ccf897cfd66264a212b6c
parentb137b9942a07843c64a934cfdb7d43155e507e13
parent64a32307b710c100beb101e9c78f8022f0e8ba61
parent337279ce3aa85d81d34c0f837d1c204df105103b
parent100cf87788c0e9104f6fb1b0ff5f72f73fbbbea3
parent539986482b0db07b7164ab086d167ab99b4d3061
parent573b638158029898caf9470c8214b7ddd29751e3
parent0bbba38a61283a55f2061ab3e0910c572d19f462
Merge branches 'apei', 'battery-mwh-fix', 'bugzilla-10807', 'bugzilla-14736', 'bugzilla-14679', 'bugzilla-16396', 'launchpad-613381' and 'misc' into release
drivers/acpi/apei/erst-dbg.c
drivers/acpi/apei/erst.c
drivers/acpi/bus.c