net/hsr: Move to per-hsr device prune timer.
authorArvid Brodin <arvid.brodin@alten.se>
Fri, 4 Jul 2014 21:35:47 +0000 (23:35 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Jul 2014 18:35:30 +0000 (11:35 -0700)
Signed-off-by: Arvid Brodin <arvid.brodin@alten.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/hsr/hsr_device.c
net/hsr/hsr_framereg.c
net/hsr/hsr_framereg.h
net/hsr/hsr_main.c
net/hsr/hsr_main.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge