summaryrefslogtreecommitdiffstats
path: root/arch/ia64/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds2018-12-28 23:06:43 +0100
committerLinus Torvalds2018-12-28 23:06:43 +0100
commitfe2b0cdabcd9e6aeca66a104bc03576946e5fee2 (patch)
tree3abffb169919155a4039188f7262c9fd9c64457d /arch/ia64/Makefile
parentMerge tag 'for-4.21/aio-20181221' of git://git.kernel.dk/linux-block (diff)
parentsata_rcar: fix deferred probing (diff)
downloadkernel-qcow2-linux-fe2b0cdabcd9e6aeca66a104bc03576946e5fee2.tar.gz
kernel-qcow2-linux-fe2b0cdabcd9e6aeca66a104bc03576946e5fee2.tar.xz
kernel-qcow2-linux-fe2b0cdabcd9e6aeca66a104bc03576946e5fee2.zip
Merge tag 'for-4.21/libata-20181221' of git://git.kernel.dk/linux-block
Pull libata updates from Jens Axboe: "Here are the libata changes for this merge window. Nothing major in here. This contains: - GPIO descriptor conversions (Linus Walleij) - rcar deferred probing fix (Sergei Shtylyov)" * tag 'for-4.21/libata-20181221' of git://git.kernel.dk/linux-block: sata_rcar: fix deferred probing ata: palmld: Introduce state container ata: palmld: Convert to GPIO descriptors ata: rb532_cf: Convert to use GPIO descriptors ata: sata_highbank: Convert to use GPIO descriptors ata: pxa: Drop <linux/gpio.h> include
Diffstat (limited to 'arch/ia64/Makefile')
0 files changed, 0 insertions, 0 deletions