git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67a3e12 2903037)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 31 May 2010 07:10:35 +0000 (00:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 31 May 2010 07:10:35 +0000 (00:10 -0700)
1  2 
drivers/net/fs_enet/mac-fcc.c patch | diff1 | diff2 | blob | history
net/core/skbuff.c patch | diff1 | diff2 | blob | history
net/ipv4/udp.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/fs_enet/mac-fcc.c
Simple merge
diff --cc net/core/skbuff.c
Simple merge
diff --cc net/ipv4/udp.c
Simple merge
Pandora Kernel Repository