davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
008d23e485
kernel-ark/fs/coda
History
Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -08:00
..
cache.c fs: dcache remove dcache_lock 2011-01-07 17:50:23 +11:00
cnode.c Coda: add spin lock to protect accesses to struct coda_inode_info. 2010-10-25 08:02:40 -07:00
coda_int.h drop unused dentry argument to ->fsync 2010-05-27 22:05:02 -04:00
coda_linux.c
dir.c fs: provide rcu-walk aware permission i_ops 2011-01-07 17:50:29 +11:00
file.c Coda: push BKL regions into coda_upcall() 2010-10-25 08:02:40 -07:00
inode.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
Kconfig fs/Kconfig: move coda out 2009-01-22 13:16:01 +03:00
Makefile
pioctl.c fs: provide rcu-walk aware permission i_ops 2011-01-07 17:50:29 +11:00
psdev.c Coda: replace BKL with mutex 2010-10-25 08:02:40 -07:00
symlink.c Coda: push BKL regions into coda_upcall() 2010-10-25 08:02:40 -07:00
sysctl.c sysctl: Drop & in front of every proc_handler. 2009-11-18 08:37:40 -08:00
upcall.c Coda: replace BKL with mutex 2010-10-25 08:02:40 -07:00