aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd/commit.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2006-09-26 02:32:02 +0000
committerLinus Torvalds <[email protected]>2006-09-26 02:32:02 +0000
commit656ddf798dbe588217c97e58b9cfdfce649ebdc3 (patch)
treee02659c481b7beb61b9f63c88e4cd200a4369517 /fs/jbd/commit.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[libata] Fix oops introduced in non-uniform port handling fix (diff)
downloadkernel-656ddf798dbe588217c97e58b9cfdfce649ebdc3.tar.gz
kernel-656ddf798dbe588217c97e58b9cfdfce649ebdc3.zip
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata] Fix oops introduced in non-uniform port handling fix [PATCH] ata-piix: fixes kerneldoc error
Diffstat (limited to 'fs/jbd/commit.c')
0 files changed, 0 insertions, 0 deletions