diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 19:22:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 19:22:59 -0400 |
| commit | 75cb5fdce29c77ec54db45f0c6be7cc5715f8e15 (patch) | |
| tree | ffc1d292d9b26a02d76f517c591f78b2aa8b576d /drivers/zorro/zorro.ids | |
| parent | ce06ea8339de1dca3455e9c89c56ea161988ab71 (diff) | |
| parent | b2691085d1f3ccce641dcfdd02722ba5d34db6ba (diff) | |
| parent | 9f242dc10e0c3c1eb32d8c83c18650a35fd7f80d (diff) | |
| parent | 68f202e4e87cfab4439568bf397fcc5c7cf8d729 (diff) | |
| parent | 5bbd4a336c81d32df71642abf310cf3d0c98dc9b (diff) | |
| parent | 8e221b6db4477643fefc885a97ea9889ac733140 (diff) | |
| parent | be783a47214afc5a0aea9dafcbd9f1535ba05e94 (diff) | |
Merge branches 'x86-cleanups-for-linus', 'x86-vmware-for-linus', 'x86-mtrr-for-linus', 'x86-apic-for-linus', 'x86-fpu-for-linus' and 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Clean up arch/x86/kernel/cpu/mtrr/cleanup.c: use ";" not "," to terminate statements
* 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, vmware: Preset lpj values when on VMware.
* 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, mtrr: Use stop machine context to rendezvous all the cpu's
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86/apic/es7000_32: Remove unused variable
* 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Avoid unnecessary __clear_user() and xrstor in signal handling
* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, vdso: Unmap vdso pages