summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/s3c-hsotg.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-02-21 10:45:52 +0100
committerJiri Kosina <jkosina@suse.cz>2013-02-21 10:45:52 +0100
commit0d69a3c731e120b05b7da9fb976830475a3fbc01 (patch)
treef53647d8800028f27e37a60d227e35c0894be6c4 /drivers/usb/gadget/s3c-hsotg.c
parentMerge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig', 'fo... (diff)
parentHID: clean up quirk for Sony RF receivers (diff)
parentHID: steelseries: fix out of bound array access (diff)
downloadlinux-0d69a3c731e120b05b7da9fb976830475a3fbc01.tar.xz
linux-0d69a3c731e120b05b7da9fb976830475a3fbc01.zip
Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus
Conflicts: drivers/hid/hid-core.c