Merge remote-tracking branch 'workqueues/for-next'

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge

diff --cc block/elevator.c
Simple merge

diff --cc drivers/net/can/sja1000/peak_pci.c
Simple merge

diff --cc drivers/net/wimax/i2400m/netdev.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2100.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/sdio.c
Simple merge

diff --cc include/linux/elevator.h
Simple merge

diff --cc init/main.c
Simple merge

diff --cc kernel/kprobes.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge