diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 18:03:19 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 18:03:19 +0200 |
commit | 1f43c5393033de90bac4410352b1d2a69dcbe7ef (patch) | |
tree | 3e6c3b9e9ea4dd6620a3b8332546a3cbbeddb1fd /sound/drivers/mpu401/mpu401_uart.c | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | x86: fix PCI MSI breaks when booting with nosmp (diff) | |
download | linux-1f43c5393033de90bac4410352b1d2a69dcbe7ef.tar.xz linux-1f43c5393033de90bac4410352b1d2a69dcbe7ef.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
x86: fix PCI MSI breaks when booting with nosmp
x86: vget_cycles() __always_inline
x86: add more boot protocol documentation
bootprotocol: cleanup
x86: fix warning in "x86: clean up vSMP detection"
x86: !x & y typo in mtrr code
Diffstat (limited to 'sound/drivers/mpu401/mpu401_uart.c')
0 files changed, 0 insertions, 0 deletions