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)
1  2 
drivers/input/mouse/synaptics.c

Simple merge