From: David Woodhouse <David.Woodhouse@intel.com>
Date: Wed, 21 Nov 2012 10:38:13 +0000 (+0000)
Subject: Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
X-Git-Tag: firefly_0821_release~3680^2~1591^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=851462444d421c223965b12b836bef63da61b57f;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/mtd/nand/nand_base.c
---

851462444d421c223965b12b836bef63da61b57f