]> 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, 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)
commita372c51a1507fd86d7e413d043443388661eeb72
tree842cf24f53e8451058afa9a58a4ac7e54c7099be
parentcd4df4ae0eaf8f90d8dab2c8b3a568077a38fb8e
parente77311761d4a682324d7955b50d2fd0a1644cfe1
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

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