git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 144ce87 7cc2edb)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 26 Jan 2011 21:49:30 +0000 (13:49 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 26 Jan 2011 21:49:30 +0000 (13:49 -0800)
1  2 
drivers/net/bnx2.c patch | diff1 | diff2 | blob | history
net/core/ethtool.c patch | diff1 | diff2 | blob | history
net/core/skbuff.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/bnx2.c
Simple merge
diff --cc net/core/ethtool.c
Simple merge
diff --cc net/core/skbuff.c
Simple merge
Pandora Kernel Repository