git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
10ce3cc
131c713
)
Merge branch 'next' into for-linus
author
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Tue, 27 Mar 2012 07:27:10 +0000
(
00:27
-0700)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Tue, 27 Mar 2012 07:27:10 +0000
(
00:27
-0700)
Conflicts:
drivers/input/tablet/wacom_sys.c
Trivial merge