Merge branch 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Jul 2007 22:26:31 +0000 (15:26 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Jul 2007 22:26:31 +0000 (15:26 -0700)
commitf3d9071667752e5d419e59f76912ed3fb4a6bb9c
treee8787124dbe9bdd7e12d7c427c9ee6036cbe7783
parent6dfce901a450534d046b7950682243d5fb665783
parent5d3a8cd34beb1521a2697c6ed7b647ef9bafdbf1
Merge branch 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block

* 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block:
  bsg: fix missing space in version print
  Don't define empty struct bsg_class_device if !CONFIG_BLK_DEV_BSG
  bsg: Kconfig updates
  bsg: minor cleanup
  bsg: device hash table cleanup
  bsg: fix initialization error handling bugs
  bsg: mark FUJITA Tomonori as bsg maintainer
  bsg: convert to dynamic major
  bsg: address various review comments