aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-24 08:37:03 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-24 08:37:03 -0700
commit67e3812426efbe62dd765eed9895cd3098def948 (patch)
treeb38073c956ed46cc1d5953abd34beb669e3f8b8a /net
parent278654541017bc93befe3570edeabd5d9e95e4ea (diff)
parentb964638ffd59b61c13f02b81e5118a6e573d91cd (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: JFS: Fix multiple errors in metapage_releasepage
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions