]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release
authorLen Brown <len.brown@intel.com>
Wed, 2 Jun 2010 02:53:36 +0000 (22:53 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 2 Jun 2010 02:53:36 +0000 (22:53 -0400)
commitb42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732
tree194e13dfa85d2d2af8bd125acd80a445ee0def62
parentfe955682d2153b35dffcf1673dff0491096a3f0a
parent0a76a34ff0804f1f413807b2e2d12117c2b602ca
Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release
drivers/acpi/ec.c
drivers/acpi/sleep.c