diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-09-21 14:20:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-21 14:20:08 -0400 |
| commit | da7add323d1e00e867e4e8ef51789acdd1d749cd (patch) | |
| tree | c51eec74029ef7ad1a1b9811200caac82801b4f1 /net/lapb/lapb_timer.c | |
| parent | slcan: rewrite of slc_bump and slc_encaps (diff) | |
| parent | sfc: Increase MCDI status timeout to 250ms (diff) | |
| download | wireguard-linux-da7add323d1e00e867e4e8ef51789acdd1d749cd.tar.xz wireguard-linux-da7add323d1e00e867e4e8ef51789acdd1d749cd.zip | |
Merge branch 'sfc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc
Ben Hutchings says:
====================
Daniel Pieczko fixed two bugs in reset handling that particularly
affected the new SFC9120 controller.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions