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: 1bb4696 279a60a)

author	John W. Linville <linville@tuxdriver.com>
	Wed, 13 Jun 2012 19:35:35 +0000 (15:35 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 13 Jun 2012 19:35:35 +0000 (15:35 -0400)
commit	6724d01d7a24d0dd067dcc1784483691a1842357
tree	2acf7fe32b30f537b06fed7e4c536ef0d11f2902	tree \| snapshot
parent	1bb46962af1af2a85ae817b8aca25cd709f52ffe	commit \| diff
parent	279a60a3e9c9e3c455a5c51fa9362fb6666cdd71	commit \| diff

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

Conflicts:
drivers/net/wireless/ath/ath9k/main.c
net/bluetooth/hci_event.c

drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/hci.h	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_event.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/mgmt.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/smp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.