]> www.infradead.org Git - mtd-utils.git/commitdiff
projects / mtd-utils.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97bb4aa 0970bf4)
Merge branch 'brian' v1.4.7
authorArtem Bityutskiy <Artem.Bityutskiy@intel.com>
Fri, 18 Nov 2011 21:53:11 +0000 (23:53 +0200)
committerArtem Bityutskiy <Artem.Bityutskiy@intel.com>
Fri, 18 Nov 2011 21:53:11 +0000 (23:53 +0200)
1  2 
ubi-utils/ubiformat.c patch | diff1 | diff2 | blob | history

diff --cc ubi-utils/ubiformat.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.