summaryrefslogtreecommitdiffstats
path: root/net/sysctl_net.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-02-07 14:06:11 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-02-07 14:06:11 -0800
commite25c173379d1053f0851fa924cd608fc0b16252f (patch)
tree5819d87168530aacef34d3d2fadc45069de901fa /net/sysctl_net.c
parentabaaf3e12c74ef39c8ba185c485f63274264cb0f (diff)
parent217c8b2b1978aa4a02ce040a99c59ed3b6418fe5 (diff)
downloadlinux-e25c173379d1053f0851fa924cd608fc0b16252f.tar.bz2
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: wiimote: fix invalid power_supply_powers call HID: wacom: Fix invalid power_supply_powers calls HID: hyperv: Properly disconnect the input device HID: usbhid: fix dead lock between open and disconect
Diffstat (limited to 'net/sysctl_net.c')
0 files changed, 0 insertions, 0 deletions