]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branches 'bugzilla-13121+', 'bugzilla-13233', 'redhat-bugzilla-500311', 'pci...
authorLen Brown <len.brown@intel.com>
Sat, 30 May 2009 01:30:01 +0000 (21:30 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 30 May 2009 01:30:01 +0000 (21:30 -0400)
1  2  3  4  5  6 
drivers/acpi/video.c

Simple merge