projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fa172f4 c276aca)
Merge git://git.infradead.org/mtd-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jul 2009 18:25:46 +0000 (11:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jul 2009 18:25:46 +0000 (11:25 -0700)
commit5c5d4e8eafd0e54c2134c23296b1d7996c304fe1
treee994f543ad768eaa6736577b87989d56183b19e9tree | snapshot
parentfa172f40068b50f0ad7ae352a2466d0acc579e00commit | diff
parentc276aca46d26aa2347320096f8ecdf5016795c14commit | diff
Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6:
  mtd: nand: fix build failure and incorrect return from omap_wait()
  mtd: Use BLOCK_NIL consistently in NFTL/INFTL
  mtd: m25p80 timeout too short for worst-case m25p16 devices
  mtd: atmel_nand: Fix typo s/parititions/partitions/
  mtd: cmdlineparts: Use 64-bit format when printing a debug message.
  mtd: maps: Remove BUS_ID_SIZE from integrator_flash
  jffs2: fix another potential leak on error path in scan.c
John Crispins staging tree