c12141a8abd046dde464f50aa837eb9ae854918 parent 5ba7026b4467b55fedddf73d093ef3322e8e5b52 parent 0e3d0f3d960bf5b895adcf9ffc79d2077f1411d5 author Linus Torvalds 1334260147 -0700 committer Linus Torvalds 1334260147 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input Pull input updates from Dmitry Torokhov: "Just a few small fixes..." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: da9052 - fix memory leak in da9052_onkey_probe() Input: gpio_mouse - use linux/gpio.h rather than asm/gpio.h Input: trackpoint - use psmouse_fmt() for messages Input: elantech - v4 is a clickpad, with only one button Input: elantech - reset touchpad before configuring it Input: sentelic - filter taps in absolute mode Input: tps6507x-ts - fix MODULE_ALIAS to match driver name ҁ2h6x