From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 7 Feb 2008 20:45:28 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
X-Git-Tag: v2.6.25-rc1~293
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfa271d026fef5d8db9a95342c38eab6f7b287a2;p=linux-2.6

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:
  sysfs: remove BUG_ON() from sysfs_remove_group()
  Driver core: Revert "Fix Firmware class name collision"
  Block: Fix whole_disk attribute bug
---

bfa271d026fef5d8db9a95342c38eab6f7b287a2