tree 356842da9d4c3966a9781f6eb05fa77beec144bc
parent d3f8fd765e94b9137e1f27bbb0ac25289f9e565c
parent 7220c0177b45600eef2cfd3e5e57ab5b96f3222c
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1170864648 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1170864648 -0800

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