summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/rsserial.c
diff options
context:
space:
mode:
authorJens Axboe2014-04-15 22:02:24 +0200
committerJens Axboe2014-04-15 22:02:24 +0200
commitf89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0 (patch)
tree6d4ca8c67dc22d1c81053392078588f9ab3804b5 /drivers/acpi/acpica/rsserial.c
parentblock: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO (diff)
parentLinux 3.15-rc1 (diff)
downloadkernel-qcow2-linux-f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0.tar.gz
kernel-qcow2-linux-f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0.tar.xz
kernel-qcow2-linux-f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0.zip
Merge tag 'v3.15-rc1' into for-3.16/core
We don't like this, but things have diverged with the blk-mq fixes in 3.15-rc1. So merge it in.
Diffstat (limited to 'drivers/acpi/acpica/rsserial.c')
0 files changed, 0 insertions, 0 deletions