diff options
| author | Linus Torvalds | 2014-07-16 22:11:42 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-07-16 22:11:42 +0200 |
| commit | b6603fe574af289dbe9eb9fb4c540bca04f5a053 (patch) | |
| tree | b315434a4c29fedc5f140cbc0f2053822d57bd9b /net/ipv4/gre_offload.c | |
| parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | mtd: cfi_cmdset_0001.c: add support for Sharp LH28F640BF NOR (diff) | |
| download | kernel-qcow2-linux-b6603fe574af289dbe9eb9fb4c540bca04f5a053.tar.gz kernel-qcow2-linux-b6603fe574af289dbe9eb9fb4c540bca04f5a053.tar.xz kernel-qcow2-linux-b6603fe574af289dbe9eb9fb4c540bca04f5a053.zip | |
Merge tag 'for-linus-20140716' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Brian Norris:
- Fix ELM suspend/resume
- Reduce warnings if NAND ECC is too weak
- Add CFI support for Sharp LH28F640BF NOR
The last fix is coming in because other commits in the 3.16 cycle
depended on this support.
* tag 'for-linus-20140716' of git://git.infradead.org/linux-mtd:
mtd: cfi_cmdset_0001.c: add support for Sharp LH28F640BF NOR
mtd: nand: reduce the warning noise when the ECC is too weak
mtd: devices: elm: fix elm_context_save() and elm_context_restore() functions
Diffstat (limited to 'net/ipv4/gre_offload.c')
0 files changed, 0 insertions, 0 deletions