aboutsummaryrefslogtreecommitdiff
path: root/fs/jfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-17 19:47:31 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-17 19:47:31 -0800
commit728c7763e7234cf8d34fa159660df736556563c9 (patch)
treefe66af9029dd1aea787d2a231a82dcaf5dc4c9ee /fs/jfs
parentd1138cf035ad5a8dc0796b213bd078a2fb92eb7c (diff)
parenta1bd9e68573239320d18823c73eb06d8e56cc9e2 (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'fs/jfs')
0 files changed, 0 insertions, 0 deletions