]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 14 Sep 2009 04:16:56 +0000 (21:16 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 14 Sep 2009 04:16:56 +0000 (21:16 -0700)
1  2 
drivers/input/keyboard/atkbd.c
drivers/input/serio/i8042-x86ia64io.h

Simple merge
Simple merge