summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-19 10:44:54 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-19 10:44:54 -0800
commit55ec86f848a5f872fd43f5d7206464a0af419110 (patch)
tree409fdf94a443468ebca6d90908752325ca177cc8
parent21228e455756be11fbbcae7e1a184ad9d842f687 (diff)
parent147dd5610c8d1bacb88a6c1dfdaceaf257946ed0 (diff)
parentd949750fed168b6553ca11ed19e4affd19d7a4d7 (diff)
downloadop-kernel-dev-55ec86f848a5f872fd43f5d7206464a0af419110.zip
op-kernel-dev-55ec86f848a5f872fd43f5d7206464a0af419110.tar.gz
Merge branches 'x86-fixes-for-linus' and 'perf-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-32: Make sure we can map all of lowmem if we need to x86, vt-d: Handle previous faults after enabling fault handling x86: Enable the intr-remap fault handling after local APIC setup x86, vt-d: Fix the vt-d fault handling irq migration in the x2apic mode x86, vt-d: Quirk for masking vtd spec errors to platform error handling logic x86, xsave: Use alloc_bootmem_align() instead of alloc_bootmem() bootmem: Add alloc_bootmem_align() x86, gcc-4.6: Use gcc -m options when building vdso x86: HPET: Chose a paranoid safe value for the ETIME check x86: io_apic: Avoid unused variable warning when CONFIG_GENERIC_PENDING_IRQ=n * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: Fix off by one in perf_swevent_init() perf: Fix duplicate events with multiple-pmu vs software events ftrace: Have recordmcount honor endianness in fn_ELF_R_INFO scripts/tags.sh: Add magic for trace-events tracing: Fix panic when lseek() called on "trace" opened for writing
OpenPOWER on IntegriCloud