git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9917c85 290eddc)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 23 Oct 2012 15:41:46 +0000 (11:41 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 23 Oct 2012 15:41:46 +0000 (11:41 -0400)
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
net/mac80211/mlme.c


Trivial merge
Pandora Kernel Repository