Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 16 Dec 2008 23:23:54 +0000 (15:23 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Dec 2008 23:23:54 +0000 (15:23 -0800)
commit354ade9058687fdef8a612c7b298d4c51dae3da7
tree842cf24f53e8451058afa9a58a4ac7e54c7099be
parent9f690db7ff4cb32493c0b0b13334cc4f5fd49a6b
parentbb5f133dbc4f04b6388715d364ae5865455166c2
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/enc28j60.c
drivers/net/enc28j60.c
drivers/net/tlan.c