]> 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>
Mon, 23 Mar 2009 20:35:04 +0000 (13:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 23 Mar 2009 20:35:04 +0000 (13:35 -0700)
commit8597aff1abb4ca91ba62b59568cfe283345d8456
tree8416607b62ec352176c81afd6f4e7b571ceb957f
parent084480f19146d921a3cdd4ff4127bdf3cd12b82a
parent469e74ce322f1f465b62aaae75e3c401295ac28d
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/ucc_geth.c
drivers/net/Kconfig
drivers/net/dnet.c
drivers/net/sungem.c
drivers/net/ucc_geth.c
drivers/net/ucc_geth.h
net/wireless/nl80211.c