Merge tag 'v3.10-rc7' into for-3.11/drivers
authorJens Axboe <axboe@kernel.dk>
Tue, 2 Jul 2013 06:31:48 +0000 (08:31 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 2 Jul 2013 06:31:48 +0000 (08:31 +0200)
Linux 3.10-rc7

Pull this in early to avoid doing it with the bcache merge,
since there are a number of changes to bcache between my old
base (3.10-rc1) and the new pull request.

1  2 
MAINTAINERS
include/linux/cgroup.h

diff --cc MAINTAINERS
Simple merge
Simple merge