diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-04-30 18:04:27 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-04-30 18:04:27 +0200 |
| commit | f6595444c1ee798f9c227107bb3ab14730c6497a (patch) | |
| tree | e8e06d7c2057c69e19848ee3abd6720927f5f9f9 /fs/lockd | |
| parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | mac80211_hwsim: Advertise support for AP mode channel width changes (diff) | |
| download | linux-f6595444c1ee798f9c227107bb3ab14730c6497a.tar.xz linux-f6595444c1ee798f9c227107bb3ab14730c6497a.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
net/mac80211/chan.c
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions