Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 25 Oct 2010 05:11:17 +0000 (22:11 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 25 Oct 2010 05:11:17 +0000 (22:11 -0700)
1  2 
drivers/input/evdev.c

Simple merge