]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 23 Jul 2010 21:03:38 +0000 (14:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Jul 2010 21:03:38 +0000 (14:03 -0700)
commita902895bc0ea7e3fe7fa437cc24ba2ba3ab66b71
treeb4e9e56dbde79fe7185cba511a1ffd85f5d2018e
parentf9c2a095edcdd4060a14f693c3f99736bdb69f54
parent77907f85733f78d52a5b665dcba221e0617c7daa
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/airo.c
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/libertas/host.h
drivers/net/wireless/mwl8k.c
drivers/net/wireless/orinoco/orinoco_usb.c
include/net/cfg80211.h
include/net/mac80211.h
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h