From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Oct 2010 15:31:35 +0000 (-0700)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=79346507ad48895f41b438fa562b1965721f36b9;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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
---

79346507ad48895f41b438fa562b1965721f36b9
diff --cc drivers/mtd/mtdchar.c
index a34a0fe14884,3eff1e562ad3..4759d827e8c7
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@@ -1030,10 -1131,12 +1131,10 @@@ static const struct file_operations mtd
  #endif
  };
  
 -static int mtd_inodefs_get_sb(struct file_system_type *fs_type, int flags,
 -                               const char *dev_name, void *data,
 -                               struct vfsmount *mnt)
 +static struct dentry *mtd_inodefs_mount(struct file_system_type *fs_type,
 +				int flags, const char *dev_name, void *data)
  {
-         return mount_pseudo(fs_type, "mtd_inode:", NULL, MTD_INODE_FS_MAGIC);
 -	return get_sb_pseudo(fs_type, "mtd_inode:", NULL, MTD_INODE_FS_MAGIC,
 -                             mnt);
++	return mount_pseudo(fs_type, "mtd_inode:", NULL, MTD_INODE_FS_MAGIC);
  }
  
  static struct file_system_type mtd_inodefs_type = {