Merge commit 'v2.6.30-rc6' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Mon, 18 May 2009 08:15:09 +0000 (10:15 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 18 May 2009 08:15:35 +0000 (10:15 +0200)
commit1079cac0f4eb7d968395378b1625979d4c818dd6
treed261058d95d27fe7250511d5fad69db30dc17731
parent5872144f64b34a5942f6b4acedc90b02de72c58b
parent1406de8e11eb043681297adf86d6892ff8efc27a
Merge commit 'v2.6.30-rc6' into tracing/core

Merge reason: we were on an -rc4 base, sync up to -rc6

Signed-off-by: Ingo Molnar <mingo@elte.hu>
block/blk-core.c
net/core/skbuff.c