From: Linus Torvalds 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=5331be090567d9335476f876b2d85427cd7c4426;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Merge branch 'for-linus' of git://git./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