tree 9fd6894103918f439d0e7ec35620e18018ccfa76
parent c3302931db090d87e9015c3a7ce5c97a7dd90f78
parent dc8a0843a435b2c0891e7eaea64faaf1ebec9b11
author Linus Torvalds <torvalds@linux-foundation.org> 1226014993 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1226014993 -0800

Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6:
  [JFFS2] fix race condition in jffs2_lzo_compress()
  [MTD] [NOR] Fix cfi_send_gen_cmd handling of x16 devices in x8 mode (v4)
  [JFFS2] Fix lack of locking in thread_should_wake()
  [JFFS2] Fix build failure with !CONFIG_JFFS2_FS_WRITEBUFFER
  [MTD] [NAND] OMAP2: remove duplicated #include