summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-10-25 09:54:16 +0200
committerJiri Kosina <jkosina@suse.cz>2011-10-25 09:54:16 +0200
commitb0eae38cebc54e618896d3e6a799939da51a8cac (patch)
treea99546b955b9066616d88526b050902fedb6f44a /drivers
parent3ee72ca99288f1de95ec9c570e43f531c8799f06 (diff)
parentb55ebc27b0a54ff4cdbfdcb218a85f96e502db3c (diff)
parente00ddc9b8f978ffbc6c212f780a2bb83aafe2fbd (diff)
parent0db3bfc72adf0cb70f08dfe92e4040f64e25e205 (diff)
parent3200a6a5fa36585ec1c547d4fefeb622ae02c5ec (diff)
parentb22e00f3ece8f8ca9d7b9772d750db380e742bbb (diff)
downloadlinux-b0eae38cebc54e618896d3e6a799939da51a8cac.tar.bz2
Merge branches 'acrux', 'logitech', 'multitouch', 'roccat' and 'wiimote' into for-linus