Merge branch 'master' into for-linus

Conflicts:
	block/Kconfig

Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
Jens Axboe 2010-03-19 08:05:10 +01:00
commit b4b7a4ef09
1756 changed files with 63811 additions and 49229 deletions

View file

@ -475,7 +475,7 @@ static void blk_release_queue(struct kobject *kobj)
kmem_cache_free(blk_requestq_cachep, q);
}
static struct sysfs_ops queue_sysfs_ops = {
static const struct sysfs_ops queue_sysfs_ops = {
.show = queue_attr_show,
.store = queue_attr_store,
};