tree 495baa14e638817941496c36e1443aed7dae0ea0
parent 5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc
parent 6924d99fcdf1a688538a3cdebd1f135c22eec191
author David Woodhouse <David.Woodhouse@intel.com> 1353494293 +0000
committer David Woodhouse <David.Woodhouse@intel.com> 1353494293 +0000

Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd

Conflicts:
	drivers/mtd/nand/nand_base.c