git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0963d59
31d141e
)
Merge tag 'v3.12-rc6' into devel
author
Linus Walleij
<linus.walleij@linaro.org>
Sat, 19 Oct 2013 21:24:03 +0000
(23:24 +0200)
committer
Linus Walleij
<linus.walleij@linaro.org>
Sat, 19 Oct 2013 21:24:03 +0000
(23:24 +0200)
Linux 3.12-rc6
Conflicts:
drivers/gpio/gpio-lynxpoint.c
Trivial merge