]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
authorDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 21 Nov 2012 10:38:13 +0000 (10:38 +0000)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 21 Nov 2012 10:38:13 +0000 (10:38 +0000)
commit851462444d421c223965b12b836bef63da61b57f
tree495baa14e638817941496c36e1443aed7dae0ea0
parent5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc
parent6924d99fcdf1a688538a3cdebd1f135c22eec191
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd

Conflicts:
drivers/mtd/nand/nand_base.c