tree 46673a3c432958a4f712b064ddb9b645771cc0c3
parent a3cbe10e474ac8c2c30a151a7812e15e4cfa2775
parent f5ff4e1e62408327d27fb1e1ab00e96a52b7cd46
author Jiri Kosina <jkosina@suse.cz> 1349095134 +0200
committer Jiri Kosina <jkosina@suse.cz> 1349095134 +0200

Merge branch 'multitouch' into for-linus

Conflicts:
	drivers/hid/hid-multitouch.c