tree ae8167c0ac824d76cd63f443c631d8a101d18666
parent e90a4e475a8b34adbefe189c9d0932fa0b7b750f
parent 0a3ad00ca09632c6d0675f606276e92bdf1b306c
author Linus Torvalds <torvalds@linux-foundation.org> 1210788824 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1210788824 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

* 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>