aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/cnic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-11 14:03:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-11 14:03:42 -0800
commitbbf8fc61791eabce7102e709041a0c4e6ee4a316 (patch)
tree4c2dbcc2f1aa6feb1f37d2bac86480cfe014d4eb /drivers/net/cnic.c
parent67dcabd06126084295b5825d3d7f584450dd8553 (diff)
parenta9f0c381973097462d9688dc26fe66f4f020502e (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: psmouse - make sure we don't schedule reconnects after cleanup
Diffstat (limited to 'drivers/net/cnic.c')
0 files changed, 0 insertions, 0 deletions