]> 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>
Wed, 3 Dec 2008 03:50:27 +0000 (19:50 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Dec 2008 03:50:27 +0000 (19:50 -0800)
commit30f8253be5483591b25364d80e3846067e0f17f5
treebde0bf4aff036c6bac19a0212194ae1092afb3c9
parentbbf5afccc361bf59bac25d8254932f4395b41462
parentb34f663fc02bd08678644305ed278dcd00c975e5
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
MAINTAINERS
drivers/media/dvb/dm1105/dm1105.c
drivers/net/Kconfig
drivers/net/macvlan.c
drivers/net/smc911x.c
drivers/net/smc91x.c
drivers/net/xen-netfront.c
net/unix/af_unix.c
net/unix/garbage.c