summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-21 23:39:28 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-21 23:39:28 +0400
commit6551d6fe2128eaeb487c42ec4b1864b5f3245e60 (patch)
treea3abd7477ac0931b26697494cc6b206b4a5b7f1e /drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
parent868f480bed5266347b168c2bbe7b010cf9cac1dd (diff)
parent35b1da4e1e1026b5195649170dfb9ebb52f808e0 (diff)
downloadlinux-6551d6fe2128eaeb487c42ec4b1864b5f3245e60.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: "Updates for the input subsystem. Just a few driver updates mostly dealing with recent regressions." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: edt-ft5x06 - return -EFAULT on copy_to_user() error Input: sentelic - filter out erratic movement when lifting finger Input: ambakmi - [un]prepare clocks when enabling amd disabling Input: i8042 - disable mux on Toshiba C850D Revert "input: ab8500-ponkey: Create AB8500 domain IRQ mapping" Input: imx_keypad - fix missing clk conversions Input: usbtouchscreen - initialize eGalax devices
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/resource_tracker.c')
0 files changed, 0 insertions, 0 deletions