Merge branches 'acpi_pad-bugzilla-42981', 'apei-bugzilla-43282', 'video-bugzilla...
authorLen Brown <len.brown@intel.com>
Sat, 30 Jun 2012 04:53:50 +0000 (00:53 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 30 Jun 2012 04:53:50 +0000 (00:53 -0400)
commit6eca954e25e8a67e48334e668b9ac7da21fcbc6f
treeb3fbfa130d9e0add2469ebea325d8340af89de27
parent5f1601261050251a5ca293378b492a69d590dacb
parent34ddeb035d704eafdcdb3cbc781894300136c3c4
parentb03738430c7537d5f87948e0b35d8aaf2688c6b4
parentf6b54f083cc66cf9b11d2120d8df3c2ad4e0836d
parent76eb9a30db4bc8fd172f9155247264b5f2686d7b
Merge branches 'acpi_pad-bugzilla-42981', 'apei-bugzilla-43282', 'video-bugzilla-43168', 'bugzilla-40002' and 'bugfix-misc' into release

bug fixes
arch/x86/kernel/reboot.c
drivers/acpi/video.c