diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-18 09:50:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-18 09:50:40 -0400 |
| commit | 5304d5fc74a269cc6c3e70f9713684ca729abdf0 (patch) | |
| tree | 6a5db62915abd260241a2b9aee34086c93293ca6 /sound/pci/emu10k1/io.c | |
| parent | 54d35f29f49224d86b994acb6e5969b9ba09022d (diff) | |
| parent | 78af08d90b8f745044b1274430bc4bc6b2b27aca (diff) | |
Merge branch 'linus' into sched/core
Merge reason: branch had an old upstream base (-rc1-ish), but also
merge to avoid a conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/pci/emu10k1/io.c')
0 files changed, 0 insertions, 0 deletions