Merge stable/linux-2.6.33.y into rt/2.6.33
authorThomas Gleixner <tglx@linutronix.de>
Mon, 31 May 2010 14:58:52 +0000 (16:58 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 31 May 2010 14:58:52 +0000 (16:58 +0200)
commitef4afcc4401e92982f4ffd3fae6a9a6745a98596
tree664aba7fdb59ca1c2782c8b8cf35f53e7e5c5c85
parentac43be5cbbaeb75b43eb2914e089f560f0529e34
parenta00123deed0cd4f1bed1bb78e3ec42028384e0b6
Merge stable/linux-2.6.33.y into rt/2.6.33

Conflicts:
Makefile

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Makefile
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/time.c
drivers/char/tty_io.c
fs/cifs/cifsglob.h
fs/cifs/inode.c
fs/exec.c
fs/proc/array.c
fs/proc/task_mmu.c
include/linux/sched.h
kernel/fork.c