tree f8312f1f96edd4025640039e0f25a685f8185573
parent 123f794fa7d592644881a20801638d88521d0b06
parent 969affd276dec81a35a5ad10d4e05e62e93b380b
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1202417128 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1202417128 -0800

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