diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-02 14:45:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-02 14:45:52 -0800 |
| commit | 81d92dc117bf9954f24a8d88c2d1ef26bd13ecc7 (patch) | |
| tree | efe80084a1b48c80017c70b7adf338b6e7e13250 /lib/debug_locks.c | |
| parent | ad2be3796ff4c834e5c102d5455e76ee07dcf71d (diff) | |
| parent | 89cf38dd536a7301d6b5f5ddd73f42074c01bfaa (diff) | |
| download | linux-81d92dc117bf9954f24a8d88c2d1ef26bd13ecc7.tar.bz2 | |
Merge tag 'for-linus-20141102' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Brian Norris:
"Three main MTD fixes for 3.18:
- A regression from 3.16 which was noticed in 3.17. With the
restructuring of the m25p80.c driver and the SPI NOR library
framework, we omitted proper listing of the SPI device IDs. This
means m25p80.c wouldn't auto-load (modprobe) properly when built as
a module. For now, we duplicate the device IDs into both modules.
- The OMAP / ELM modules were depending on an implicit link ordering.
Use deferred probing so that the new link order (in 3.18-rc) can
still allow for successful probing.
- Fix suspend/resume support for LH28F640BF NOR flash"
* tag 'for-linus-20141102' of git://git.infradead.org/linux-mtd:
mtd: cfi_cmdset_0001.c: fix resume for LH28F640BF chips
mtd: omap: fix mtd devices not showing up
mtd: m25p80,spi-nor: Fix module aliases for m25p80
mtd: spi-nor: make spi_nor_scan() take a chip type name, not spi_device_id
mtd: m25p80: get rid of spi_get_device_id
Diffstat (limited to 'lib/debug_locks.c')
0 files changed, 0 insertions, 0 deletions