diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 21:29:21 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 21:33:01 +0200 |
| commit | e1c502482853f84606928f5a2f2eb6da1993cda1 (patch) | |
| tree | ca296007164906342a195bdf3a5305277e6af5da /arch/ia64/include/asm/dma-mapping.h | |
| parent | Merge branch 'x86-stage-3-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | reiserfs: rename [cn]_* variables (diff) | |
| download | linux-e1c502482853f84606928f5a2f2eb6da1993cda1.tar.xz linux-e1c502482853f84606928f5a2f2eb6da1993cda1.zip | |
Merge branch 'reiserfs-updates' from Jeff Mahoney
* reiserfs-updates: (35 commits)
reiserfs: rename [cn]_* variables
reiserfs: rename p_._ variables
reiserfs: rename p_s_tb to tb
reiserfs: rename p_s_inode to inode
reiserfs: rename p_s_bh to bh
reiserfs: rename p_s_sb to sb
reiserfs: strip trailing whitespace
reiserfs: cleanup path functions
reiserfs: factor out buffer_info initialization
reiserfs: add atomic addition of selinux attributes during inode creation
reiserfs: use generic readdir for operations across all xattrs
reiserfs: journaled xattrs
reiserfs: use generic xattr handlers
reiserfs: remove i_has_xattr_dir
reiserfs: make per-inode xattr locking more fine grained
reiserfs: eliminate per-super xattr lock
reiserfs: simplify xattr internal file lookups/opens
reiserfs: Clean up xattrs when REISERFS_FS_XATTR is unset
reiserfs: remove IS_PRIVATE helpers
reiserfs: remove link detection code
...
Fixed up conflicts manually due to:
- quota name cleanups vs variable naming changes:
fs/reiserfs/inode.c
fs/reiserfs/namei.c
fs/reiserfs/stree.c
fs/reiserfs/xattr.c
- exported include header cleanups
include/linux/reiserfs_fs.h
Diffstat (limited to 'arch/ia64/include/asm/dma-mapping.h')
0 files changed, 0 insertions, 0 deletions