aboutsummaryrefslogtreecommitdiff
path: root/fs/jfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-12 00:26:34 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-12 00:26:34 -0700
commitcbd09dbbb62096c1da627eca865f988d2ed0a84e (patch)
tree9601e631cee6651c638cc7b4d2d9b7cf20b6b485 /fs/jfs
parentd81fec0f97cce4aea36a89340af247523c1263a0 (diff)
parentd4faaecbcc6d9ea4f7c05f6de6af98e2336a4afb (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [ZLIB]: Fix external builds of zlib_inflate code. [TG3]: Fix APE induced regression [SKY2]: version 1.19 [SKY2]: use netdevice stats struct [SKY2]: fiber advertise bits initialization (trivial) [SKY2]: fix power settings on Yukon XL [SKY2]: ethtool register reserved area blackout
Diffstat (limited to 'fs/jfs')
0 files changed, 0 insertions, 0 deletions