summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-picolcd_lcd.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-10-01 14:36:26 +0200
committerJiri Kosina <jkosina@suse.cz>2012-10-01 14:36:26 +0200
commitfa2bd30159499f441125495ba8d9d57f646ea42a (patch)
treef5afca7fb3bcccc81f74889adc44c08563dceb40 /drivers/hid/hid-picolcd_lcd.c
parentMerge branch 'for-next' of git://github.com/rydberg/linux into from-henrik (diff)
parentHID: hidraw: don't deallocate memory when it is in use (diff)
parentHID: lg4ff: Minor coding style fixes in lg4ff and hid-lg (diff)
parentHID: picoLCD: optimize for inactive debugfs (diff)
parentHID: Add support for Sony PS3 BD Remote Control (diff)
parentHID: uclogic: Add support for UC-Logic TWHA60 (diff)
parentHID: wacom: Fix wacom_probe error handling (diff)
parentHID: wiimote: fix weight conversion error for values > 17kg (diff)
downloadlinux-fa2bd30159499f441125495ba8d9d57f646ea42a.tar.xz
linux-fa2bd30159499f441125495ba8d9d57f646ea42a.zip
Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogic', 'wacom' and 'wiimote' into for-linus