Merge branch 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
Linus Torvalds [Mon, 14 Jul 2008 22:28:42 +0000 (15:28 -0700)]
* '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

1  2 
block/blk-core.c
kernel/hrtimer.c
kernel/rcuclassic.c
kernel/rcupreempt.c
kernel/sched.c
kernel/softirq.c
net/core/dev.c

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