summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/resource.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-28 07:22:15 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-28 07:22:15 +0900
commit3d0aa366072a194c6a339d37b85d5b99e936097e (patch)
treedf3b8adee09008de17234d5e5cec1bed756907d4 /drivers/acpi/resource.c
parentdc5bc3f1e3d886ce1193281bb2bfb2b44f4aeae4 (diff)
parent174fd8d369613c4e06660f3704caaba48dac8554 (diff)
downloadlinux-3d0aa366072a194c6a339d37b85d5b99e936097e.tar.bz2
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull blkcg fix from Jens Axboe: "One final fix that should go into 4.3. It's a simple 2x1 liner, fixing a blkcg accounting issue. It was using the wrong bio member to look at the sync and write bits..." * 'for-linus' of git://git.kernel.dk/linux-block: blkcg: fix incorrect read/write sync/async stat accounting
Diffstat (limited to 'drivers/acpi/resource.c')
0 files changed, 0 insertions, 0 deletions