Merge commit 'v2.6.36-rc5' into perf/core
authorIngo Molnar <mingo@elte.hu>
Tue, 21 Sep 2010 11:55:04 +0000 (13:55 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 21 Sep 2010 11:55:11 +0000 (13:55 +0200)
Merge reason: Pick up the latest fixes in -rc5.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
net/core/dev.c

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