Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 4 Feb 2010 03:38:22 +0000 (19:38 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 Feb 2010 03:38:22 +0000 (19:38 -0800)
commit9c119ba54c0fcae72881948af3d37b47a2f8e1f9
tree0be51b0bf02ece3bb32955e9d33a3998ecd57250
parenta4b97f2054af2e411c414ed4cb5e1d0dbfd24a47
parentfdd3d631cddad20ad9d3e1eb7dbf26825a8a121f
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
drivers/net/ixgbe/ixgbe_main.c
drivers/net/netxen/netxen_nic_main.c
drivers/net/sky2.c
net/key/af_key.c