projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5a6ea4a
6924d99
)
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
author
David Woodhouse
<David.Woodhouse@intel.com>
Wed, 21 Nov 2012 10:38:13 +0000
(10:38 +0000)
committer
David Woodhouse
<David.Woodhouse@intel.com>
Wed, 21 Nov 2012 10:38:13 +0000
(10:38 +0000)
Conflicts:
drivers/mtd/nand/nand_base.c
Trivial merge