hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 99f0e49b7924f53913e87eab0910802f4beb087e
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Mar 4 15:03:30 2008 +0100

    added suspend quirks for a HP Omnibook 6100
    
    Added slightly adopted version of a patch to add suspend quirks for
    a HP Omnibook 6100, contributed by Denis D. <hdfssk at gmail.com> via HAL ML.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index a539662..c326008 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -71,6 +71,11 @@
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
       </match>
+      <!-- yes, system.hardware.version is correct for this machine -->
+      <match key="system.hardware.version" string="HP OmniBook 6100 EB">
+        <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_outof="nc2400;nc6120;nc6320;nx7300;nw8440;6710b">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>