]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1af356c11f83d225b4c9530d336cc84d477d7f31
tree098fbb9b45213feeb5e093a9a690ef76e624469a
parente66c8633c658cf0507ca79c3d8f0bf1d50ab7776
parentdb04e8e139453ff75abfcab845617f4cea1632c0
Merge branch 'master' of master.kernel.org:/pub/scm/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
drivers/net/ixgbe/ixgbe_main.c