2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 21:24:00 +08:00
linux-next/drivers/mtd/devices
Linus Torvalds 7b3480f8b7 MTD pull for 3.3
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iEYEABECAAYFAk8Mq/MACgkQdwG7hYl686PeFACfZCgbdDWD9A/JL+i1RMfExVu6
 Pi0An3Hmc3PTCp0yQ21KtcKhpF9CAMEu
 =NfuL
 -----END PGP SIGNATURE-----

Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6

MTD pull for 3.3

* tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6: (113 commits)
  mtd: Fix dependency for MTD_DOC200x
  mtd: do not use mtd->block_markbad directly
  logfs: do not use 'mtd->block_isbad' directly
  mtd: introduce mtd_can_have_bb helper
  mtd: do not use mtd->suspend and mtd->resume directly
  mtd: do not use mtd->lock, unlock and is_locked directly
  mtd: do not use mtd->sync directly
  mtd: harmonize mtd_writev usage
  mtd: do not use mtd->lock_user_prot_reg directly
  mtd: mtd->write_user_prot_reg directly
  mtd: do not use mtd->read_*_prot_reg directly
  mtd: do not use mtd->get_*_prot_info directly
  mtd: do not use mtd->read_oob directly
  mtd: mtdoops: do not use mtd->panic_write directly
  romfs: do not use mtd->get_unmapped_area directly
  mtd: do not use mtd->get_unmapped_area directly
  mtd: do use mtd->point directly
  mtd: introduce mtd_has_oob helper
  mtd: mtdcore: export symbols cleanup
  mtd: clean-up the default_mtd_writev function
  ...

Fix up trivial edit/remove conflict in drivers/staging/spectra/lld_mtd.c
2012-01-10 13:45:22 -08:00
..
block2mtd.c MTD pull for 3.3 2012-01-10 13:45:22 -08:00
doc2000.c mtd: doc: do not initialize mtd_info fields to 0 or NULL 2012-01-09 18:25:53 +00:00
doc2001.c mtd: doc: do not initialize mtd_info fields to 0 or NULL 2012-01-09 18:25:53 +00:00
doc2001plus.c mtd: doc: do not initialize mtd_info fields to 0 or NULL 2012-01-09 18:25:53 +00:00
docecc.c mtd: spelling, capitalization, uniformity 2011-09-11 15:02:13 +03:00
docg3.c mtd: doc: do not initialize mtd_info fields to 0 or NULL 2012-01-09 18:25:53 +00:00
docg3.h mtd: docg3: fixes and cleanups 2012-01-09 18:13:05 +00:00
docprobe.c mtd: docprobe: use kzalloc instead 2012-01-09 18:25:51 +00:00
Kconfig mtd: Fix dependency for MTD_DOC200x 2012-01-09 18:26:27 +00:00
lart.c mtd: lart: cleanup: drop HAVE_PARTITIONS 2011-09-11 15:02:05 +03:00
m25p80.c mtd: Remove redundant spi driver bus initialization 2012-01-09 18:07:31 +00:00
Makefile mtd: Add DiskOnChip G3 support 2011-10-14 12:03:47 +03:00
ms02-nv.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
ms02-nv.h MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
mtd_dataflash.c mtd: Remove redundant spi driver bus initialization 2012-01-09 18:07:31 +00:00
mtdram.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
phram.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
pmc551.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
slram.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
sst25l.c mtd: sst25l: kill unused variable 2012-01-09 18:26:01 +00:00