summaryrefslogtreecommitdiff
path: root/drivers/ide/tx4939ide.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-11 10:36:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-11 10:36:12 -0700
commit0a33f80a8373eca7f4bea3961d1346c3815fa5ed (patch)
tree16b0c0364340416f1e27bebdd4042ffe0e6fef8f /drivers/ide/tx4939ide.c
parentc29f5ec022451546be1e0b24c330a0368e63e4a7 (diff)
parent003dec8913d6bebb4ecc989ec04a235cf38f5ea9 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (25 commits) GFS2: Merge gfs2_get_sb into gfs2_get_sb_meta GFS2: Fix cache coherency between truncate and O_DIRECT read GFS2: Fix locking issue mounting gfs2meta fs GFS2: Remove unused variable GFS2: smbd proccess hangs with flock() call. GFS2: Remove args subdir from gfs2 sysfs files GFS2: Remove lockstruct subdir from gfs2 sysfs files GFS2: Move gfs2_unlink_ok into ops_inode.c GFS2: Move gfs2_readlinki into ops_inode.c GFS2: Move gfs2_rmdiri into ops_inode.c GFS2: Merge mount.c and ops_super.c into super.c GFS2: Clean up some file names GFS2: Be more aggressive in reclaiming unlinked inodes GFS2: Add a rgrp bitmap full flag GFS2: Improve resource group error handling GFS2: Don't warn when delete inode fails on ro filesystem GFS2: Update docs GFS2: Umount recovery race fix GFS2: Remove a couple of unused sysfs entries GFS2: Add commit= mount option ...
Diffstat (limited to 'drivers/ide/tx4939ide.c')
0 files changed, 0 insertions, 0 deletions