commit 3e3b3916a9c5c28a16528585478de19fea59816b
author Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Dec 18 09:42:44 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Dec 18 09:42:44 2007 -0800
tree f7da78c1044840e62008ac7b5512b40713c342bc
parent 51dad801e271f3754a728e5b9a2ef974576490cc
parent 4aae07025265151e3f7041dfbf0f529e122de1d8

Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: fix "Kernel panic - not syncing: IO-APIC + timer doesn't work!"
  genirq: revert lazy irq disable for simple irqs
  x86: also define AT_VECTOR_SIZE_ARCH
  x86: kprobes bugfix
  x86: jprobe bugfix
  timer: kernel/timer.c section fixes
  genirq: add unlocked version of set_irq_handler()
  clockevents: fix reprogramming decision in oneshot broadcast
  oprofile: op_model_athlon.c support for AMD family 10h barcelona performance counters