hal: Branch 'master'

[Sjoerd Simons]

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

New commits:
commit 8e938d993667fbed9f0ce7d7c7fe1acc466a2481
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Fri Nov 16 19:53:31 2007 +0100

    added suspend quirk for  MacBook3,1
    
    Added suspend quirk for MacBook3,1. This fourth generation/update of macbooks
    sold since November 2007

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
index 7b5621b..ab9cdb2 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
@@ -14,12 +14,16 @@
         </match>
       </match>
 
-      <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>
+      <match key="system.hardware.product" string="MacBook3,1">
+        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+      </match>
+
+      <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="MacBookPro2,2">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>