kernel_optimize_test/include/linux/mtd
Linus Torvalds 79346507ad Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (82 commits)
  mtd: fix build error in m25p80.c
  mtd: Remove redundant mutex from mtd_blkdevs.c
  MTD: Fix wrong check register_blkdev return value
  Revert "mtd: cleanup Kconfig dependencies"
  mtd: cfi_cmdset_0002: make sector erase command variable
  mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips
  mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode
  mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one
  block2mtd: dubious assignment
  P4080/mtd: Fix the freescale lbc issue with 36bit mode
  P4080/eLBC: Make Freescale elbc interrupt common to elbc devices
  mtd: phram: use KBUILD_MODNAME
  mtd: OneNAND: S5PC110: Fix double call suspend & resume function
  mtd: nand: fix MTD_MODE_RAW writes
  jffs2: use kmemdup
  mtd: sm_ftl: cosmetic, use bool when possible
  mtd: r852: remove useless pci powerup/down from suspend/resume routines
  mtd: blktrans: fix a race vs kthread_stop
  mtd: blktrans: kill BKL
  mtd: allow to unload the mtdtrans module if its block devices aren't open
  ...

Fix up trivial whitespace-introduced conflict in drivers/mtd/mtdchar.c
2010-10-30 08:31:35 -07:00
..
bbm.h mtd: nand: introduce NAND_CREATE_EMPTY_BBT 2010-10-25 00:54:37 +01:00
blktrans.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
cfi_endian.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
cfi.h mtd: cfi_cmdset_0002: make sector erase command variable 2010-10-26 11:39:17 +01:00
concat.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
doc2000.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
flashchip.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
fsmc.h mtd: generic FSMC NAND MTD driver 2010-10-25 00:33:48 +01:00
ftl.h
gen_probe.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
inftl.h mtd: inftl.h: fix spacing errors 2010-10-24 23:27:24 +01:00
map.h mtd: Remove obsolete <mtd/compatmac.h> include 2010-08-08 21:19:42 +01:00
mtd.h mtd: edit comments on deprecation of ioctl ECCGETLAYOUT 2010-10-24 23:37:27 +01:00
mtdram.h mtd: mtdram.h: checkpatch cleanup 2010-05-10 14:11:30 +01:00
nand_ecc.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
nand-gpio.h
nand.h mtd: remove junk tabs in nand.h 2010-10-25 00:56:51 +01:00
ndfc.h
nftl.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
onenand_regs.h mtd: OneNAND: multiblock erase support 2009-11-30 09:43:18 +00:00
onenand.h mtd: OneNAND: Introduce chip_probe function 2010-08-04 10:51:47 +01:00
partitions.h mtd: prepare partition add and del functions for ioctl requests 2010-10-25 00:47:37 +01:00
pfow.h
physmap.h mtd-physmap: add support users can assign the probe type in board files 2010-08-08 12:28:15 +01:00
pismo.h mtd: Really add ARM pismo support 2010-01-13 09:04:53 +00:00
plat-ram.h
pmc551.h
qinfo.h
sh_flctl.h mtd/nand/sh_flctl: Move function mtd_to_flctl to fix build failure 2010-05-12 23:24:23 +01:00
sharpsl.h
super.h convert get_sb_mtd() users to ->mount() 2010-10-29 04:16:26 -04:00
ubi.h UBI: Add ubi_open_volume_path 2009-11-24 08:18:54 +02:00
xip.h