Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 24 May 2012 08:13:01 +0000 (01:13 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 24 May 2012 08:13:01 +0000 (01:13 -0700)
commite644dae645e167d154c0526358940986682a72b0
tree972993c6568085b8d407fc7e13de10f4b93c651d
parent899c612d74d4a242158a4db20367388d6299c028
parent86809173ce32ef03bd4d0389dfc72df0c805e9c4
Merge branch 'next' into for-linus
drivers/input/mouse/synaptics.c