Revision 79346507ad48895f41b438fa562b1965721f36b9 authored by Linus Torvalds on 30 October 2010, 15:31:35 UTC, committed by Linus Torvalds on 30 October 2010, 15:31:35 UTC
* 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
2 parent s 706d4b1 + 4084743
History
File Mode Size
Kconfig -rw-r--r-- 40.2 KB
Makefile -rw-r--r-- 1.0 KB
calibrate.c -rw-r--r-- 5.1 KB
do_mounts.c -rw-r--r-- 10.9 KB
do_mounts.h -rw-r--r-- 1.4 KB
do_mounts_initrd.c -rw-r--r-- 3.1 KB
do_mounts_md.c -rw-r--r-- 7.9 KB
do_mounts_rd.c -rw-r--r-- 8.1 KB
initramfs.c -rw-r--r-- 12.6 KB
main.c -rw-r--r-- 21.6 KB
noinitramfs.c -rw-r--r-- 1.5 KB
version.c -rw-r--r-- 1.1 KB

back to top