diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-05 21:49:02 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-05 21:49:02 +0100 |
| commit | 353c78152c10027b8da5de446bad3472f977fcdc (patch) | |
| tree | 8663ca32b912e8b3df428f570b7fd376aa3aa0cb /net/nfc/rawsock.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| parent | nl80211: fix channel switch parsing (diff) | |
| download | linux-353c78152c10027b8da5de446bad3472f977fcdc.tar.xz linux-353c78152c10027b8da5de446bad3472f977fcdc.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
net/wireless/reg.c
Diffstat (limited to 'net/nfc/rawsock.c')
0 files changed, 0 insertions, 0 deletions