git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 34202e2 c9015b2)

author	John W. Linville <linville@tuxdriver.com>
	Fri, 29 Jun 2012 16:07:37 +0000 (12:07 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 29 Jun 2012 16:07:37 +0000 (12:07 -0400)
commit	42fb0b0278e6b9a44bee8adec051de5f43e10b2b
tree	f53513819d11445385346cf75be05054dae3438d	tree \| snapshot (tar.gz zip)
parent	34202e28fe7fc8551313f9a035a8857db83de757	commit \| diff
parent	c9015b24b262bc7ea56cfd5d78983a73fb5ebd7d	commit \| diff

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

15 files changed:

drivers/bluetooth/btmrvl_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/btusb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc_drv_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/debugfs.c	diff1 \|	\|	blob \| history
drivers/net/wireless/iwlwifi/dvm/mac80211.c	diff1 \|	\|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/ie.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/mgmt.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history

Motorola kernel-slsi