Merge branch 'linus' into tracing/core

Merge reason: tracing/core was on a .30-rc1 base and was missing out on
              on a handful of tracing fixes present in .30-rc5-almost.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 6 insertions, 0 deletions

diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 9ce8548c03e4..71515ddb4593 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1393,6 +1393,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
                 .name = "HP nx6125",
                 .type = AC97_TUNE_MUTE_LED
         },
+        {
+                .subvendor = 0x103c,
+                .subdevice = 0x3091,
+                .name = "unknown HP",
+                .type = AC97_TUNE_MUTE_LED
+        },
         { } /* terminator */
 };