git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e880eb6 819bfec)

author	David S. Miller <davem@davemloft.net>
	Tue, 23 Mar 2010 01:15:15 +0000 (18:15 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 23 Mar 2010 01:15:15 +0000 (18:15 -0700)
commit	33e2bf6aa16061bae1253514e7c32af27d2b4b31
tree	652d13b4feea9a8f562186e7badae72d2e22fe1f	tree \| snapshot
parent	e880eb6c5c9d98e389ffc0d8947f75d70785361a	commit \| diff
parent	819bfecc4fc6b6e5a793f719a45b7146ce423b79	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6

Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c

16 files changed:

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/reg.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/reset.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/libipw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/libipw_module.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-3945.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rndis_wlan.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree