diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-21 18:57:56 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-21 18:57:56 +0100 |
| commit | b3117494772d8f906625905c6e203af745ee3530 (patch) | |
| tree | cc8960455f9e1f18d0939fddd0e96f349613f753 /drivers/sh | |
| parent | brcmfmac: include linux/vmalloc.h from usb.c (diff) | |
| parent | Merge tag 'nfc-fixes-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-b3117494772d8f906625905c6e203af745ee3530.tar.xz linux-b3117494772d8f906625905c6e203af745ee3530.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/iwlwifi/pcie/tx.c
Diffstat (limited to 'drivers/sh')
0 files changed, 0 insertions, 0 deletions