projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff879eb d01032e)
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)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath5k/base.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath5k/led.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/b43/main.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge
diff --cc drivers/net/wireless/ath/ath5k/led.c
Simple merge
diff --cc drivers/net/wireless/b43/main.c
Simple merge
John Crispins staging tree