tree 5f33d7f3d217f06ed67ac4862878e0ad78aa91ff
parent 8ebf975608aaebd7feb33d77f07ba21a6380e086
parent fa047e4f6fa63a6e9d0ae4d7749538830d14a343
parent 57fd637ad9ac6b13c1c47b9a0ced4ee99bb26e76
author Jiri Kosina <jkosina@suse.cz> 1244821333 +0200
committer Jiri Kosina <jkosina@suse.cz> 1244821333 +0200

Merge branches 'upstream' and 'ntrig-multitouch' into for-linus