| commit | 96fbeb973a7e17594a429537201611ca0b395622 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 18 09:27:49 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 18 09:27:49 2010 -0700 |
| tree | 0f90e3724f804776d6ae00009c2e30bd4ab015aa | |
| parent | 1f8caa986a5f4de2e40f3defe66a07b4c5a019c2 [diff] | |
| parent | fea24e28c663e62663097f0ed3b8ff1f9a87f15e [diff] |
Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, mrst: add nop functions to x86_init mpparse functions x86, mrst, pci: return 0 for non-present pci bars x86: Avoid check hlt for newer cpus