projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d8d1f30 832c10f)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 11 Jun 2010 18:34:06 +0000 (11:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 11 Jun 2010 18:34:06 +0000 (11:34 -0700)
commit14599f1e341ee219abdd15f4eee5872d6f2d29f1
tree3875181429010e58416ab34e6c06ef42de52e756tree | snapshot
parentd8d1f30b95a635dbd610dcc5eb641aca8f4768cfcommit | diff
parent832c10fd733893f86c63bde1c65b005d5a2fe346commit | diff
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6

Conflicts:
drivers/net/wireless/wl12xx/wl1271.h
drivers/net/wireless/wl12xx/wl1271_cmd.h
20 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/wireless/ipw2x00/ipw2100.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/iwl-commands.h diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/iwl-dev.h diff1 | diff2 | blob | history
drivers/net/wireless/mwl8k.c diff1 | diff2 | blob | history
drivers/net/wireless/orinoco/hermes_dld.c diff1 | diff2 | blob | history
drivers/net/wireless/orinoco/orinoco_usb.c diff1 | diff2 | blob | history
drivers/net/wireless/orinoco/wext.c diff1 | diff2 | blob | history
drivers/net/wireless/prism54/isl_ioctl.c diff1 | diff2 | blob | history
drivers/net/wireless/rndis_wlan.c diff1 | diff2 | blob | history
drivers/net/wireless/rt2x00/rt2800.h diff1 | diff2 | blob | history
drivers/net/wireless/wl12xx/wl1271.h diff1 | diff2 | blob | history
drivers/net/wireless/wl12xx/wl1271_cmd.h diff1 | diff2 | blob | history
drivers/net/wireless/wl12xx/wl1271_ini.h | diff2 | blob | history
drivers/net/wireless/wl12xx/wl1271_tx.h diff1 | diff2 | blob | history
include/net/cfg80211.h diff1 | diff2 | blob | history
net/mac80211/cfg.c diff1 | diff2 | blob | history
net/mac80211/ieee80211_i.h diff1 | diff2 | blob | history
net/mac80211/rx.c diff1 | diff2 | blob | history
net/mac80211/sta_info.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.