git.stricted.de - GitHub/moto-9609/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5171f7a d786f67)

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	b90af3b8c69730fb25646c04866dfccec2f1314b
tree	fb4a7dd23f5d8b7803d89f1e3fb1ab075f1c06a0	tree \| snapshot (tar.gz zip)
parent	5171f7a0b79dfbc61a6e12f20f6eef6d7dd5b2a8	commit \| diff
parent	d786f67e5c587a4de8245336cb64cf4dd06871a7	commit \| diff

Merge branch 'master' of git://git./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