projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0b5c25e 28c8e47)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 15 Jun 2010 05:59:34 +0000 (22:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Jun 2010 05:59:34 +0000 (22:59 -0700)
commit6b08f516244abda22c07b5e7db10ef109dc43f2d
tree098fbb9b45213feeb5e093a9a690ef76e624469atree | snapshot
parent0b5c25e8ac3a60bd01a52ca7405ba96aec8c16becommit | diff
parent28c8e4790ca5ef75f54895ca46437f9fbb433ddfcommit | diff
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/ixgbe/ixgbe_ethtool.c

With merge conflict help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ixgbe/ixgbe_ethtool.c diff1 | diff2 | blob | history
drivers/net/ixgbe/ixgbe_main.c diff1 | diff2 | blob | history
John Crispins staging tree