summary refs log tree commit diff
path: root/net/appletalk
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-07-16 10:11:42 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-16 10:11:42 -1000
commitb6603fe574af289dbe9eb9fb4c540bca04f5a053 (patch)
treeb315434a4c29fedc5f140cbc0f2053822d57bd9b /net/appletalk
parentbcf44bfe5e929468b781082889d4b17245aff3ca (diff)
parent812c5fa82bae9f377f49000d7636c19a8b61735c (diff)
downloadlinux-b6603fe574af289dbe9eb9fb4c540bca04f5a053.tar.gz
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/appletalk')
0 files changed, 0 insertions, 0 deletions