diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 10:36:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 10:36:30 -0700 |
| commit | 67d112842586aa11506b7a8afec29391bf8f3cca (patch) | |
| tree | dff25f229ea115c8281819d224fbb18f851dc2b2 /sound/oss | |
| parent | d3f15800d5752ca4814270180798ab8323157d28 (diff) | |
| parent | 2576c9991758e431b73e374f6019d6e1e12a8d36 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: fix AMDC1E and XTOPOLOGY conflict in cpufeature
x86: build fix
Diffstat (limited to 'sound/oss')
0 files changed, 0 insertions, 0 deletions