]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'bugzilla-13041' into release
authorLen Brown <len.brown@intel.com>
Fri, 24 Apr 2009 05:35:24 +0000 (01:35 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 24 Apr 2009 05:35:24 +0000 (01:35 -0400)
1  2 
drivers/acpi/sleep.c

Simple merge