Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 May 2007 16:58:49 +0000 (09:58 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 May 2007 16:58:49 +0000 (09:58 -0700)
commitcabca0cb0d0e8579428d8f8c3f606e2f01d26d14
treea32426d345bab465488df20a228a495a12b26b8b
parent853da0022023c046e0a5ccc51d427745f0c94de7
parent87c1efbfeac49849b981a7eac8cba42d4a49b2e9
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
  Fix compile/link of init/do_mounts.c with !CONFIG_BLOCK
  When stacked block devices are in-use (e.g. md or dm), the recursive calls
include/linux/sched.h