| commit | 851462444d421c223965b12b836bef63da61b57f | [log] [tgz] |
|---|---|---|
| author | David Woodhouse <David.Woodhouse@intel.com> | Wed Nov 21 10:38:13 2012 +0000 |
| committer | David Woodhouse <David.Woodhouse@intel.com> | Wed Nov 21 10:38:13 2012 +0000 |
| tree | 495baa14e638817941496c36e1443aed7dae0ea0 | |
| parent | 5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc [diff] | |
| parent | 6924d99fcdf1a688538a3cdebd1f135c22eec191 [diff] |
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd Conflicts: drivers/mtd/nand/nand_base.c