git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
33f7724
ef00e58
)
Merge branch 'stable-3.2' into pandora-3.2
author
Grazvydas Ignotas
<notasas@gmail.com>
Sat, 22 Sep 2012 21:32:18 +0000
(
00:32
+0300)
committer
Grazvydas Ignotas
<notasas@gmail.com>
Sat, 22 Sep 2012 21:32:18 +0000
(
00:32
+0300)
Conflicts:
drivers/mtd/ubi/vtbl.c
Trivial merge