Merge branch 'WIP.sched/core' into sched/core

 Conflicts:
	kernel/sched/Makefile

Pick up the waitqueue related renames - it didn't get much feedback,
so it appears to be uncontroversial. Famous last words? ;-)

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc drivers/iommu/of_iommu.c
Simple merge

diff --cc kernel/printk/printk.c
Simple merge

diff --cc kernel/sched/Makefile
index 5e4c2e7,16277e2..53f0164
--- 1/kernel/sched/Makefile
--- 2/kernel/sched/Makefile
+++ b/kernel/sched/Makefile
@@@ -16,9 -16,9 +16,9 @@@ CFLAGS_core.o := $(PROFILING) -fno-omit
  endif
  
  obj-y += core.o loadavg.o clock.o cputime.o
 -obj-y += idle_task.o fair.o rt.o deadline.o stop_task.o
 +obj-y += idle_task.o fair.o rt.o deadline.o
- obj-y += wait.o swait.o completion.o idle.o
+ obj-y += wait.o wait_bit.o swait.o completion.o idle.o
 -obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o topology.o
 +obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o topology.o stop_task.o
  obj-$(CONFIG_SCHED_AUTOGROUP) += autogroup.o
  obj-$(CONFIG_SCHEDSTATS) += stats.o
  obj-$(CONFIG_SCHED_DEBUG) += debug.o

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

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