tree e521fba8386bf23533cfe21ea5200e615960ec07
parent a11cdaa7af56423a921a8bdad8f5a5f4ddca918a
parent 0d0fb0f9c5fddef4a10242fe3337f00f528a3099
author Jens Axboe <jens.axboe@oracle.com> 1271181801 +0200
committer Jens Axboe <jens.axboe@oracle.com> 1271181801 +0200

Merge branch 'master' into for-2.6.35

Conflicts:
	block/blk-cgroup.c
	block/cfq-iosched.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>