summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-03-20 16:04:25 +0400
committerJiri Kosina <jkosina@suse.cz>2012-03-20 16:04:25 +0400
commit3abee3526d381e33a391362b01dc8b17d377076d (patch)
tree48e049e8df0a9059133672dd7bf4e0e4871f00a1 /drivers
parent550cf00dbc8ee402bef71628cb71246493dd4500 (diff)
parent45d9c273b262cde84bb6bb3fc02c01d07da76936 (diff)
parent765031668fb2b064aebd9a568e5ad794cbe3413a (diff)
parent9e87f22ac6353b50425c5da412fe2418a48e25a3 (diff)
downloadlinux-3abee3526d381e33a391362b01dc8b17d377076d.tar.xz
Merge branches 'battery-scope', 'logitech' and 'multitouch' into for-linus