git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcdce71 1cec972)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 7 Oct 2009 05:43:16 +0000 (22:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Oct 2009 05:43:16 +0000 (22:43 -0700)
1  2 
drivers/net/benet/be_ethtool.c patch | diff1 | diff2 | blob | history
net/core/net-sysfs.c patch | diff1 | diff2 | blob | history
net/core/pktgen.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/benet/be_ethtool.c
Simple merge
diff --cc net/core/net-sysfs.c
Simple merge
diff --cc net/core/pktgen.c
Simple merge
Pandora Kernel Repository