git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b4b306 a6d38f8)
Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 7 Jan 2011 06:34:59 +0000 (22:34 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 7 Jan 2011 06:34:59 +0000 (22:34 -0800)
Conflicts:
include/linux/input.h


Trivial merge
Pandora Kernel Repository