Merge stable update
authorThomas Gleixner <tglx@linutronix.de>
Tue, 3 Aug 2010 09:04:34 +0000 (11:04 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 3 Aug 2010 09:04:34 +0000 (11:04 +0200)
commitc88417fd85d1a2d01d3f5a6b1b10c4e5d26e7436
tree9e9d53b10f705b6b6b5eaf178a90a21779b3d6d7
parentcd4e15ad91d24bdffc6c4cb5f05be916154229a3
parent15b059e0f9e31f0e7f6b5397368054c005949fea
Merge stable update

Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.33.y

Conflicts:
Makefile

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
15 files changed:
Makefile
arch/powerpc/kernel/irq.c
arch/x86/include/asm/msr-index.h
arch/x86/kernel/traps.c
drivers/acpi/processor_idle.c
drivers/hwmon/coretemp.c
drivers/ide/ide-taskfile.c
drivers/scsi/aacraid/commctrl.c
drivers/usb/core/driver.c
kernel/futex.c
kernel/irq/manage.c
kernel/sched.c
net/core/dev.c
net/core/skbuff.c
net/mac80211/rx.c