]> 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>
Thu, 7 Apr 2011 21:05:23 +0000 (14:05 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 Apr 2011 21:05:23 +0000 (14:05 -0700)
commitdc5bf9a3aa8724f1731f9e4b9ef2e207591e8105
tree91921f7c0884813c72993fcd2ecd37dc5e56d89d
parentdc431143b30449976b6c69600f84aff778cf8662
parentc8291fc5260de8d4b53ce41faa86ec0653d2f1ea
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/benet/be_main.c
drivers/net/benet/be.h
drivers/net/benet/be_main.c
drivers/net/smsc911x.c
include/net/route.h