diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-31 15:57:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-31 15:57:56 -0800 |
| commit | b58602a4bac012b5f4fc12fe6b46ab237b610d5d (patch) | |
| tree | 38929e210a723f67fe2b945f37264bf3aae3c2c4 /drivers/ide/tx4938ide.c | |
| parent | db200df0b3530f673d8e9f5bd535e9e10305842a (diff) | |
| parent | 1f3403fa640f9f7b135dee79f2d39d01c8ad4a08 (diff) | |
| download | linux-b58602a4bac012b5f4fc12fe6b46ab237b610d5d.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (34 commits) nfsd race fixes: jfs nfsd race fixes: reiserfs nfsd race fixes: ext4 nfsd race fixes: ext3 nfsd race fixes: ext2 nfsd/create race fixes, infrastructure filesystem notification: create fs/notify to contain all fs notification fs/block_dev.c: __read_mostly improvement and sb_is_blkdev_sb utilization kill ->dir_notify() filp_cachep can be static in fs/file_table.c fix f_count description in Documentation/filesystems/files.txt make INIT_FS use the __RW_LOCK_UNLOCKED initialization take init_fs to saner place kill vfs_permission pass a struct path * to may_open kill walk_init_root remove incorrect comment in inode_permission expand some comments (d_path / seq_path) correct wrong function name of d_put in kernel document and source comment fix switch_names() breakage in short-to-short case ...
Diffstat (limited to 'drivers/ide/tx4938ide.c')
0 files changed, 0 insertions, 0 deletions