Merge branch 'sched/urgent' into sched/core, to avoid conflicts
authorIngo Molnar <mingo@kernel.org>
Wed, 7 May 2014 11:15:46 +0000 (13:15 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 7 May 2014 11:15:46 +0000 (13:15 +0200)
commit2fe5de9ce7d57498abc14b375cad2fcf8c3ee6cc
tree9478e8cf470c1d5bdb2d89b57a7e35919ab95e72
parent08f8aeb55d7727d644dbbbbfb798fe937d47751d
parent2b4cfe64dee0d84506b951d81bf55d9891744d25
Merge branch 'sched/urgent' into sched/core, to avoid conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>
drivers/block/loop.c
drivers/block/nbd.c
drivers/char/ipmi/ipmi_si_intf.c
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
drivers/scsi/fcoe/fcoe.c
kernel/sched/fair.c
mm/huge_memory.c