| commit | 6469f540ea37d53db089c8fea9c0c77a3d9353d4 | [log] [tgz] |
|---|---|---|
| author | David Woodhouse <David.Woodhouse@intel.com> | Sun Sep 20 05:55:36 2009 -0700 |
| committer | David Woodhouse <David.Woodhouse@intel.com> | Sun Sep 20 05:55:36 2009 -0700 |
| tree | 1dc9dc077150d57f4424cae49e711b5dd6e903a1 | |
| parent | 304e6d5fe294b80e6d3107f99ec241816390ebcc [diff] | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: drivers/mtd/mtdcore.c Merged in order that I can apply the Nomadik nand/onenand support patches.