Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Feb 2008 20:45:28 +0000 (12:45 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Feb 2008 20:45:28 +0000 (12:45 -0800)
commitbfa271d026fef5d8db9a95342c38eab6f7b287a2
treef8312f1f96edd4025640039e0f25a685f8185573
parent123f794fa7d592644881a20801638d88521d0b06
parent969affd276dec81a35a5ad10d4e05e62e93b380b
Merge git://git./linux/kernel/git/gregkh/driver-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  sysfs: remove BUG_ON() from sysfs_remove_group()
  Driver core: Revert "Fix Firmware class name collision"
  Block: Fix whole_disk attribute bug