]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
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
net/core/skbuff.c

Simple merge
Simple merge