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

..

acl.c

ext2,3,4: provide simple rcu-walk ACL implementation

2011-01-07 17:50:30 +11:00

acl.h

fs: provide rcu-walk aware permission i_ops

2011-01-07 17:50:29 +11:00

balloc.c

ext4: replace i_delalloc_reserved_flag with EXT4_STATE_DELALLOC_RESERVED

2011-01-10 12:12:36 -05:00

bitmap.c

ext4: Change unsigned long to unsigned int

2008-11-05 00:14:04 -05:00

block_validity.c

ext4: rename {exit,init}_ext4_*() to ext4_{exit,init}_*()

2010-10-27 21:30:14 -04:00

dir.c

ext4: Use ext4_error_file() to print the pathname to the corrupted inode

2011-01-10 12:10:55 -05:00

ext4_extents.h

ext4: drop ec_type from the ext4_ext_cache structure

2011-01-10 12:13:26 -05:00

ext4_jbd2.c

ext4: Pass line numbers to ext4_error() and friends

2010-07-27 11:56:40 -04:00

ext4_jbd2.h

ext4: dynamically allocate the jbd2_inode in ext4_inode_info as necessary

2011-01-10 12:29:43 -05:00

ext4.h

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-01-13 10:05:56 -08:00

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

file.c

ext4: dynamically allocate the jbd2_inode in ext4_inode_info as necessary

2011-01-10 12:29:43 -05:00

fsync.c

ext4: flush the i_completed_io_list during ext4_truncate

2011-01-10 12:47:05 -05:00

hash.c

ext4: Add support for non-native signed/unsigned htree hash algorithms

2008-10-28 13:21:44 -04:00

ialloc.c

ext4: drop i_state_flags on architectures with 64-bit longs

2011-01-10 12:18:25 -05: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

ioctl.c

ext4: Add EXT4_IOC_TRIM ioctl to handle batched discard

2010-11-19 21:47:07 -05:00

Kconfig

ext4: Don't ask about supporting ext2/3 in ext4 if ext4 is not configured

2009-12-21 10:54:09 -05:00

Makefile

ext4: use bio layer instead of buffer layer in mpage_da_submit_io

2010-10-27 21:30:10 -04:00

mballoc.c

ext4: fix trimming starting with block 0 with small blocksize

2011-01-11 15:16:31 -05:00

mballoc.h

ext4: consolidate in_range() definitions

2010-03-03 23:55:01 -05:00

migrate.c

ext4: ext4_ext_migrate should use NULL not 0

2011-01-10 12:11:00 -05:00

move_extent.c

ext4: rename {ext,idx}_pblock and inline small extent functions

2010-10-27 21:30:14 -04:00

namei.c

ext4: add error checking to calls to ext4_handle_dirty_metadata()

2011-01-10 12:46:59 -05:00

page-io.c

ext4: test the correct variable in ext4_init_pageio()

2011-01-10 12:10:44 -05:00

resize.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2011-01-11 14:37:31 -08:00

super.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2011-01-11 14:37:31 -08:00

symlink.c

ext4: symlink must be handled via filesystem specific operation

2010-05-16 02:00:00 -04:00

xattr_security.c

ext4: constify xattr_handler

2010-05-21 18:31:19 -04:00

xattr_trusted.c

ext4: constify xattr_handler

2010-05-21 18:31:19 -04:00

xattr_user.c

ext4: constify xattr_handler

2010-05-21 18:31:19 -04:00

xattr.c

ext2,ext3,ext4: clarify comment for extN_xattr_set_handle

2011-01-10 12:10:30 -05:00

xattr.h

ext4: fix compile with CONFIG_EXT4_FS_XATTR disabled

2010-10-28 09:29:17 -07:00