diff options
author | John W. Linville <linville@tuxdriver.com> | 2008-04-15 14:09:27 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-04-16 11:42:59 -0400 |
commit | 50c4afb99166dc0d2e8a0b063fe83befaa426a44 (patch) | |
tree | 8aa6e7ba463bfd286e683b8b5ea0980d46c9953a /init | |
parent | [TCP]: Increase the max_burst threshold from 3 to tp->reordering. (diff) | |
download | linux-dev-50c4afb99166dc0d2e8a0b063fe83befaa426a44.tar.xz linux-dev-50c4afb99166dc0d2e8a0b063fe83befaa426a44.zip |
mlme.c: fixup some merge damage
This one got renamed, complicating the merge a bit...this should restore
it to its intended state.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions