hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0284a93903dc81b984950be3f1209adf6bb185f7
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Nov 8 15:19:48 2007 +0100

    added quirk for MacBook2,1 from s2ram
    
    Added suspend quirk for a Apple MacBook2,1 from the s2ram whitelist.

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