Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 May 2008 18:13:44 +0000 (11:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 May 2008 18:13:44 +0000 (11:13 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  Driver core: struct class remove children list
  block: do_mounts - accept root=<non-existant partition>


Trivial merge