OpenCloudOS-Kernel/fs/fuse
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
..
Kconfig fs/Kconfig: move fuse out 2009-01-22 13:15:55 +03:00
Makefile CUSE: implement CUSE - Character device in Userspace 2009-06-09 11:24:11 +02:00
control.c convert get_sb_single() users 2010-10-29 04:16:28 -04:00
cuse.c fuse/cuse: fix comment typo initilaization 2011-02-15 10:26:38 +01:00
dev.c fuse: allow batching of FORGET requests 2010-12-07 20:16:56 +01:00
dir.c fuse: fix d_revalidate oopsen on NFS exports 2011-03-10 03:44:31 -05:00
file.c fuse: fix hang of single threaded fuseblk filesystem 2011-02-25 14:44:58 +01:00
fuse_i.h fuse: fix hang of single threaded fuseblk filesystem 2011-02-25 14:44:58 +01:00
inode.c exportfs: Return the minimum required handle size 2011-03-14 09:15:28 -04:00