diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-01 02:52:46 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-01 02:52:46 +0300 |
commit | e81cfd214f97a26ca2b00564258ebcf099214cbb (patch) | |
tree | a59043fc9aeb41564f36533e7dc0b507f6261a37 /arch/m68k/mac/psc.c | |
parent | 4b8d8ab566932bfe023637025c76c0e90c655faf (diff) | |
parent | 7fc49f19813030f2e15ad2ccec5cb701f7f4a3ec (diff) | |
download | linux-e81cfd214f97a26ca2b00564258ebcf099214cbb.tar.xz |
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 setup: fix asm constraints in vesa_store_edid
xen: make sysfs files behave as their names suggest
x86: tone down mtrr_trim_uncached_memory() warning
x86: correct the CPUID pattern for MSR_IA32_MISC_ENABLE availability
Diffstat (limited to 'arch/m68k/mac/psc.c')
0 files changed, 0 insertions, 0 deletions