| commit | 4e25651b70b8d6ded7229ead8181619e121b648d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 11 09:28:35 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 11 09:28:35 2012 -0700 |
| tree | 35b8366cb557a75e5fcb8b10c9d7d13d975d4216 | |
| parent | 1b76b02f15c70d5f392ee2e231fbd20a26063a77 [diff] | |
| parent | 83ca60094e5e907b8b43c60b4c29b1119604cbb8 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu Pull a m68knommu fix from Greg Ungerer: "It contains a single fix for including the ColdFire QSPI interface setup code when enabled as a module. This was broken in the consolidation of the ColdFire SoC device tables in the 3.4 merge window." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: enable qspi support when SPI_COLDFIRE_QSPI = m