Merge branch 'multitouch' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 1 Oct 2012 12:38:54 +0000 (14:38 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 1 Oct 2012 12:38:54 +0000 (14:38 +0200)
commitcdcd3ac4e945d1fcaef9907839569c2d70b2f3fa
tree46673a3c432958a4f712b064ddb9b645771cc0c3
parenta3cbe10e474ac8c2c30a151a7812e15e4cfa2775
parentf5ff4e1e62408327d27fb1e1ab00e96a52b7cd46
Merge branch 'multitouch' into for-linus

Conflicts:
drivers/hid/hid-multitouch.c
drivers/hid/hid-ids.h
drivers/hid/hid-multitouch.c