linux/drivers/mtd/nand
Linus Torvalds e16b396ce3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)
2011-03-18 10:37:40 -07:00
..
alauda.c
ams-delta.c
atmel_nand.c
atmel_nand_ecc.h
au1550nd.c
autcpu12.c
bcm_umi_bch.c
bcm_umi_nand.c
bf5xx_nand.c
cafe_nand.c
cmx270_nand.c
cs553x_nand.c
davinci_nand.c
denali.c
denali.h
diskonchip.c
edb7312.c
fsl_elbc_nand.c
fsl_upm.c
fsmc_nand.c
gpio.c
h1910.c
jz4740_nand.c
Kconfig Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-03-17 19:28:15 -07:00
Makefile
mpc5121_nfc.c
mxc_nand.c
nand_base.c
nand_bbt.c
nand_bcm_umi.c
nand_bcm_umi.h
nand_ecc.c
nand_ids.c
nandsim.c
ndfc.c
nomadik_nand.c
nuc900_nand.c
omap2.c Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-03-17 19:28:15 -07:00
orion_nand.c
pasemi_nand.c
plat_nand.c
ppchameleonevb.c
pxa3xx_nand.c
r852.c
r852.h
rtc_from4.c
s3c2410.c
sh_flctl.c
sharpsl.c
sm_common.c
sm_common.h
socrates_nand.c
spia.c
tmio_nand.c
txx9ndfmc.c