Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ...

Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.

2010-12-22 18:57:02 +01:00

..

acl.c

ext4: update ctime when changing the file's permission by setfacl

2010-06-15 12:19:59 -04:00

acl.h

ext[234]: move over to 'check_acl' permission model

2009-09-08 11:09:04 -07:00

balloc.c

ext4: rename mark_bitmap_end() to ext4_mark_bitmap_end()

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

bitmap.c

…

block_validity.c

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

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

dir.c

ext4: improve llseek error handling for overly large seek offsets

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

ext4_extents.h

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

2010-10-27 21:30:14 -04: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: Pass line numbers to ext4_error() and friends

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

ext4.h

Merge branch 'master' into for-next

2010-12-22 18:57:02 +01:00

extents.c

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04:00

file.c

ext4: improve llseek error handling for overly large seek offsets

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

fsync.c

Merge branch 'next' into upstream-merge

2010-10-27 23:44:47 -04:00

hash.c

…

ialloc.c

Merge branch 'next' into upstream-merge

2010-10-27 23:44:47 -04:00

inode.c

Merge branch 'master' into for-next

2010-12-22 18:57:02 +01: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: Don't call sb_issue_discard() in ext4_free_blocks()

2010-11-08 13:49:33 -05:00

mballoc.h

ext4: consolidate in_range() definitions

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

migrate.c

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

2010-10-27 21:30:14 -04: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: fix typo which broke '..' detection in ext4_find_entry()

2010-12-14 21:45:31 -05:00

page-io.c

ext4: fix setting random pages PageUptodate

2010-11-17 21:46:06 -05:00

resize.c

Merge branch 'next' into upstream-merge

2010-10-27 23:44:47 -04:00

super.c

ext4: Turn off multiple page-io submission by default

2010-12-14 15:27:50 -05: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

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

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

xattr.h

ext4: fix compile with CONFIG_EXT4_FS_XATTR disabled

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