diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-08 11:36:36 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-08 11:37:18 (GMT) |
| commit | ca7e0c612005937a4a5a75d3fed90459993de65c (patch) | |
| tree | b574fc0f0189b52ffc87ba20c418228db556faa1 /sound/pci/rme96.c | |
| parent | 8141d0050d76e5695011b5ab577ec66fb51a998c (diff) | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f (diff) | |
| download | linux-fsl-qoriq-ca7e0c612005937a4a5a75d3fed90459993de65c.tar.xz | |
Merge branch 'linus' into perf/core
Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c
Merge reason: pick up latest fixes, fix the conflict
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/pci/rme96.c')
| -rw-r--r-- | sound/pci/rme96.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index 9d5252b..d19dc05 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c @@ -27,7 +27,6 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/pci.h> -#include <linux/slab.h> #include <linux/moduleparam.h> #include <sound/core.h> |