Merge branch 'linus' into core/softirq
authorIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 08:52:59 +0000 (10:52 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 08:52:59 +0000 (10:52 +0200)
commita60b33cf59d1c9e0e363287fce799cb23d45660c
tree85eb8feea5717cf472a2549e53f59183a95617c5
parent0f476b6d91a1395bda6464e653ce66ea9bea7167
parent481c5346d0981940ee63037eb53e4e37b0735c10
Merge branch 'linus' into core/softirq
kernel/rcupreempt.c
kernel/sched.c
net/core/dev.c