hal-info: Branch 'master' - 3 commits

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-card-readers.fdi       |   14 ++++++++++++
 fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi     |    2 -
 fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi |    3 ++
 3 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit e3d7e8cd7776959866b0da1687a07eb5bbcfc0df
Author: Alexey Fisher <bug-track at fisher-privat.net>
Date:   Tue Apr 15 12:33:18 2008 +0200

    add hama card reader to 10-usb-card-readers.fdi
    
    Added a hama card reader to 10-usb-card-readers.fdi.

diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index d7bf3c3..4d0693c 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -91,6 +91,20 @@
         <merge key="storage.drive_type" type="string">sd_mmc</merge>
       </match>
 
+      <!-- Hama card reader -->
+      <match key="storage.model" contains="Card Reader   CF">
+	<merge key="storage.drive_type" type="string">compact_flash</merge>
+      </match>
+      <match key="storage.model" contains="Card Reader   MS">
+	<merge key="storage.drive_type" type="string">memory_stick</merge>
+      </match>
+      <match key="storage.model" contains="Card Reader   SM">
+	<merge key="storage.drive_type" type="string">smart_media</merge>
+      </match>
+      <match key="storage.model" contains="CardReaderMMC/SD">
+	<merge key="storage.drive_type" type="string">sd_mmc</merge>
+      </match>
+
       <!-- Noname multi-card Readers (vendor: Genesys Logic) -->
       <match key="@storage.originating_device:usb.vendor_id" int="0x05e3">
 	  <match key="@storage.originating_device:usb.product_id" int_outof="0x070e;0x0760;0x927">
commit a87e33dab8b892c36fab32d2a26b9dcba98927b3
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Tue Apr 15 12:24:17 2008 +0200

    add another X31 model suspend quirk
    
    Added another X31 model suspend quirk. Reported by Jonathan Corbet in
    https://launchpad.net/bugs/199059.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index d499808..a181c39 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -33,7 +33,7 @@
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
       <!-- X31 -->
-      <match key="system.hardware.product" prefix_outof="2672;2673">
+      <match key="system.hardware.product" prefix_outof="2672;2673;2884">
         <match key="system.hardware.version" contains="X31">
           <merge key="power_management.quirk.dpms_suspend" type="bool">true</merge>
           <!-- already added above
commit cd8df474813b909606349f574e3c8d32db9496c1
Author: Jean-Denis Girard <jd.girard at sysnux.pf>
Date:   Tue Apr 15 12:20:53 2008 +0200

    added suspend quirk for Samsung Q30
    
    Added suspend quirk for Samsung Q30.
    
    Info: system.hardware.primary_video.product = 13698  (0x3582)
          system.hardware.primary_video.vendor = 32902  (0x8086)
          system.kernel.version = '2.6.24.2-sysnux'

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
index bf835d9..037c5d5 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
@@ -6,6 +6,9 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" string="SQ30">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+      </match>
       <!-- Samsung UMPC, P35 (NOTE: there is a s2ram report for CoronaR to need no quirks)-->
       <match key="system.hardware.product" string_outof="R40/R41;CoronaR;SX22S">
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>