commit | bfa271d026fef5d8db9a95342c38eab6f7b287a2 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Feb 07 12:45:28 2008 -0800 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Feb 07 12:45:28 2008 -0800 |
tree | f8312f1f96edd4025640039e0f25a685f8185573 | |
parent | 123f794fa7d592644881a20801638d88521d0b06 [diff] | |
parent | 969affd276dec81a35a5ad10d4e05e62e93b380b [diff] |
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