From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 7 Feb 2007 16:10:48 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy... 
X-Git-Tag: v2.6.21-rc2~42^2~14
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5331be090567d9335476f876b2d85427cd7c4426;p=~emulex%2Finfiniband.git

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: Remove incorrect kgdb define
  JFS: call io_schedule() instead of schedule() to avoid deadlock
  JFS: Add lockdep annotations
  JFS: Avoid BUG() on a damaged file system
---

5331be090567d9335476f876b2d85427cd7c4426