diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-19 14:53:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-19 14:53:06 -0800 |
| commit | 567e47935a7cddd8e823c73bb8ee0b2805cd4940 (patch) | |
| tree | 0d1ee0eb233b7f84084f779d32ef1fb2d5be755a /arch | |
| parent | 99d1edc5c5ef5ee80982b354d57cef106cb8423c (diff) | |
| parent | f7e6746ebae984ea67b0a1a1e23c7e6698240631 (diff) | |
| parent | 6eadf1075c6f923fece419e38cf05bff559aefcd (diff) | |
| parent | 4f2f81a5621de47d42476d0b929be2e0d565df84 (diff) | |
| download | linux-567e47935a7cddd8e823c73bb8ee0b2805cd4940.tar.bz2 | |
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