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)
commit6afec830acc75a4dc4a7547c66fbf18152c946ef
tree29424993d889a8919d715df41ce059a46a5db92e
parent93bcece20ef87c29548ec7e66532f1018572cea0
parent7d60e8ab0d5507229dfbdf456501cc378610fa01
parent34d531e640cb805973cf656b15c716b961565cea
parentdacd2549ca61ddbdd1ed62a76ca95dea3f0e02c6
parent31db5645bda24682dadbc97d5e8a7918ade2a298
parent2f102607ac77354b02a76cf2748598ce9f270f08
Merge branches 'bugzilla-13121+', 'bugzilla-13233', 'redhat-bugzilla-500311', 'pci-bind-oops', 'misc-2.6.30' and 'i7300_idle' into release
drivers/acpi/video.c