hal: Branch 'master'

[David Zeuthen]

 fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi |    3 +++
 1 files changed, 3 insertions(+)

New commits:
diff-tree 28bfbaaebc0f234589e349e5180c1774d1f24921 (from a9a768e0e041d4c5cd149142451561beea52b148)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed May 16 16:57:40 2007 -0700

    add quirks for 1st generation Macbook Pro
    
    Verified on my own hardware. Yay, my Macbook Pro now suspends and resumes
    correctly!

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
index 4fc3036..55ee006 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
@@ -2,6 +2,9 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" prefix="Apple">
+      <match key="system.hardware.product" string="MacBookPro1,1">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+      </match>
       <match key="system.hardware.product" string="MacBook1,1">
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
       </match>