aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-17 16:11:41 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-17 16:11:41 -0700
commit15eb7105a74a0a5d72d006fec2192b0ec692b5cc (patch)
treeb774ed6e13751f590038c1d0454436326339cd62 /drivers/net
parenta5d1792847172077d173c959c37d4562b9ec69e6 (diff)
parentcef0893dcf1fdf22943aa49e75ee1eb3bfffe5f5 (diff)
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
* 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2: configfs: Make sure configfs_init() is called before consumers. configfs: configfs_mkdir() failed to cleanup linkage. configfs: Fix a reference leak in configfs_mkdir(). ocfs2: fix gfp mask in some file system paths ocfs2: Don't populate uptodate cache in ocfs2_force_read_journal() ocfs2: take meta data lock in ocfs2_file_aio_read() ocfs2: take data locks around extend
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions