summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-19 23:53:06 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-19 23:53:06 +0100
commit567e47935a7cddd8e823c73bb8ee0b2805cd4940 (patch)
tree0d1ee0eb233b7f84084f779d32ef1fb2d5be755a /arch
parentMerge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6 (diff)
parentsched/accounting, proc: Fix /proc/stat interrupts sum (diff)
parentMerge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
parentx86, syscall: Need __ARCH_WANT_SYS_IPC for 32 bits (diff)
downloadlinux-567e47935a7cddd8e823c73bb8ee0b2805cd4940.tar.xz
linux-567e47935a7cddd8e823c73bb8ee0b2805cd4940.zip
Merge branches 'sched-urgent-for-linus', 'perf-urgent-for-linus' and 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/accounting, proc: Fix /proc/stat interrupts sum * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: tracepoints/module: Fix disabling tracepoints with taint CRAP or OOT x86/kprobes: Add arch/x86/tools/insn_sanity to .gitignore x86/kprobes: Fix typo transferred from Intel manual * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, syscall: Need __ARCH_WANT_SYS_IPC for 32 bits x86, tsc: Fix SMI induced variation in quick_pit_calibrate() x86, opcode: ANDN and Group 17 in x86-opcode-map.txt x86/kconfig: Move the ZONE_DMA entry under a menu x86/UV2: Add accounting for BAU strong nacks x86/UV2: Ack BAU interrupt earlier x86/UV2: Remove stale no-resources test for UV2 BAU x86/UV2: Work around BAU bug x86/UV2: Fix BAU destination timeout initialization x86/UV2: Fix new UV2 hardware by using native UV2 broadcast mode x86: Get rid of dubious one-bit signed bitfield