tree ac0351e3242df1bcf69f9ecc66c3f9249318616a
parent 72c16d9a5c303dce928a52a8861fe7a2a25f849a
parent b42065f31704686e69002343403f45fff863a120
parent 89759e20d9571e0496c7e12fc4a3ce2a5233f18e
author Jiri Kosina <jkosina@suse.cz> 1367309947 +0200
committer Jiri Kosina <jkosina@suse.cz> 1367309947 +0200

Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into for-linus

Conflicts:
	drivers/hid/Kconfig