git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ddec008
8eedd52
)
Merge branch 'stable-3.2' into pandora-3.2
author
Grazvydas Ignotas
<notasas@gmail.com>
Wed, 6 Feb 2013 15:55:31 +0000
(17:55 +0200)
committer
Grazvydas Ignotas
<notasas@gmail.com>
Wed, 6 Feb 2013 15:55:31 +0000
(17:55 +0200)
Conflicts:
drivers/mtd/ubi/attach.c
Trivial merge