]> 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, 11 Nov 2009 19:38:16 +0000 (11:38 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Nov 2009 19:38:16 +0000 (11:38 -0800)
commit161801fcd8d1517f436bacf5c870a0cb2411a59b
treecfa228cd187f600fd93b858b46e656bb24b0020e
parentf17d5ccceb17eb2871c0841351e88420451e3e0b
parent84197a6c015bf7093f9db8848b57191a46ff0f06
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
MAINTAINERS
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/led.c
drivers/net/wireless/b43/main.c