Merge branches 'upstream' and 'ntrig-multitouch' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Fri, 12 Jun 2009 15:42:13 +0000 (17:42 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 12 Jun 2009 15:42:13 +0000 (17:42 +0200)
commit6341de0527c26ea1eaf7b7918e1df98f99e1a525
tree5f33d7f3d217f06ed67ac4862878e0ad78aa91ff
parent8ebf975608aaebd7feb33d77f07ba21a6380e086
parentfa047e4f6fa63a6e9d0ae4d7749538830d14a343
parent57fd637ad9ac6b13c1c47b9a0ced4ee99bb26e76
Merge branches 'upstream' and 'ntrig-multitouch' into for-linus