projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5872144 1406de8)
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)
Merge reason: we were on an -rc4 base, sync up to -rc6

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
block/blk-core.c patch | diff1 | diff2 | blob | history
net/core/skbuff.c patch | diff1 | diff2 | blob | history

diff --cc block/blk-core.c
Simple merge
diff --cc net/core/skbuff.c
Simple merge
John Crispins staging tree