diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-07-25 16:22:36 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-07-25 16:22:36 +0200 |
| commit | 9a244409d0b0cf3b1e46f1dc331f2c718597fae0 (patch) | |
| tree | 5d5aa1964a1f97cb978a33b3533134ee624f90b6 /kernel/watchdog.c | |
| parent | b43: enable 5 GHz support for N-PHY devices (diff) | |
| parent | ath9k: fix aggregation session lockup (diff) | |
| download | linux-9a244409d0b0cf3b1e46f1dc331f2c718597fae0.tar.xz linux-9a244409d0b0cf3b1e46f1dc331f2c718597fae0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/cfg.c
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'kernel/watchdog.c')
0 files changed, 0 insertions, 0 deletions