Merge branch 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

* 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  softirq: remove irqs_disabled warning from local_bh_enable
  softirq: remove initialization of static per-cpu variable
  Remove argument from open_softirq which is always NULL

diff --cc block/blk-core.c
Simple merge

diff --cc kernel/hrtimer.c
Simple merge

diff --cc kernel/rcuclassic.c
Simple merge

diff --cc kernel/rcupreempt.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/softirq.c
Simple merge

diff --cc net/core/dev.c
Simple merge