diff options
| author | John W. Linville | 2012-10-23 17:41:46 +0200 |
|---|---|---|
| committer | John W. Linville | 2012-10-23 17:41:46 +0200 |
| commit | 9b34f40c20111ba658f88e1669598db494be1fbc (patch) | |
| tree | be98189b178ca63a44c09c8a5e92574a92932b51 /include/net/nfc/hci.h | |
| parent | brcm80211: remove some truely barftastic code (diff) | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber... (diff) | |
| download | kernel-qcow2-linux-9b34f40c20111ba658f88e1669598db494be1fbc.tar.gz kernel-qcow2-linux-9b34f40c20111ba658f88e1669598db494be1fbc.tar.xz kernel-qcow2-linux-9b34f40c20111ba658f88e1669598db494be1fbc.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
net/mac80211/mlme.c
Diffstat (limited to 'include/net/nfc/hci.h')
0 files changed, 0 insertions, 0 deletions