hal: Branch 'origin' - 3 commits

[Richard Hughes]

 fdi/information/10freedesktop/10-usb-music-players.fdi   |    9 +++++++++
 fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi |    5 +++++
 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |    4 ++++
 3 files changed, 18 insertions(+)

New commits:
diff-tree 39e1426d05f3907cd1f8973098a521ab2a6484cc (from 5738b123c73897d7db74f5432d1f22302c19538d)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Jun 1 00:22:32 2007 +0200

    added Lyra MC2021C USB MP3-Player
    
    Added adopted patch from Brian J. Murrell <brian at interlinx.bc.ca> from
    fd.o bug #11048 for Lyra MC2021C MP3-Player.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 2fd141e..fb7cfcb 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -374,6 +374,15 @@
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
 	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
 	  </match>
+          <!-- Lyra MC2021C -->
+          <match key="@storage.originating_device:usb.product_id" int="0x767">
+            <merge key="portable_audio_player.type" type="string">generic</merge>
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/audible</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+          </match>
 	</match>
 
 	<!-- SanDisk -->
diff-tree 5738b123c73897d7db74f5432d1f22302c19538d (from 946eec45636530a2631f2faef66d80f5fc648e77)
Author: Mads Villadsen <maxx at krakoa.dk>
Date:   Thu May 31 15:30:24 2007 +0100

    apply Dell D820 quirk to fix suspend resume
    
    Add Dell D820 quirk to fix suspend resume.
    Patch by Mads Villadsen <maxx at krakoa.dk>, many thanks.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index f5478c5..90a7cb7 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -26,6 +26,10 @@
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
+        <match key="system.hardware.product" contains="D820">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+        </match>
         <match key="system.hardware.product" contains="C600">
           <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
         </match>
diff-tree 946eec45636530a2631f2faef66d80f5fc648e77 (from 44ddbb607a12a59039b6255e83a14fdd02444b55)
Author: osma ahvenlampi <oa at iki.fi>
Date:   Thu May 31 15:24:26 2007 +0100

    Add TravelMate 380 resume quirk.
    
    Add TravelMate 380 (Pentium M / Intel 852GM) quirk to fix resume.
    Patch by osma ahvenlampi <oa at iki.fi>, many thanks.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index ebfc10a..db3ba9f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -27,6 +27,11 @@
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" prefix="TravelMate 380">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
       <!-- TravelMate 630Lci -->
       <match key="system.hardware.product" prefix="TravelMate 630">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>