]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 7 Feb 2007 16:10:48 +0000 (08:10 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 7 Feb 2007 16:10:48 +0000 (08:10 -0800)
* '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


Trivial merge