git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cbd1f5a 9b2564c)

author	John W. Linville <linville@tuxdriver.com>
	Thu, 14 Feb 2013 19:23:33 +0000 (14:23 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Thu, 14 Feb 2013 19:23:33 +0000 (14:23 -0500)
commit	e06530ab66d1a164232119ddcb68fdcb0723207d
tree	fb4a7dd23f5d8b7803d89f1e3fb1ab075f1c06a0	tree \| snapshot
parent	cbd1f5aec57e664166a22b55a89a27e0cc7a412d	commit \| diff
parent	9b2564c446fc853d093ed061a720991914a32275	commit \| diff

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
drivers/net/wireless/iwlwifi/dvm/tx.c

16 files changed:

drivers/bcma/bcma_private.h	diff1 \|	diff2 \|	blob \| history
drivers/bcma/driver_chipcommon_nflash.c	diff1 \|	diff2 \|	blob \| history
drivers/bcma/driver_gpio.c	diff1 \|	diff2 \|	blob \| history
drivers/bcma/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/usb.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/driver_gpio.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/main.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/ssb_private.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.