summaryrefslogtreecommitdiff
path: root/drivers/atm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-07-26 09:43:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-07-26 09:43:43 -0700
commit55d31aaec0da46801e7337779bb3ebe88b034ef3 (patch)
tree872d5f671b24678351821431bbd48f2315b9266b /drivers/atm
parent6108cd475ca8323fa9d9b584c44a5229a9a26aa5 (diff)
parent94bccc34071094c165c79b515d21b63c78f7e968 (diff)
Merge branch 'for-linus-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft
Pull iscsi_ibft fix from Konrad Rzeszutek Wilk: "One tiny fix to enable iSCSI IBFT to be compiled under ARM" * 'for-linus-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft: iscsi_ibft: make ISCSI_IBFT depend on ACPI instead of ISCSI_IBFT_FIND
Diffstat (limited to 'drivers/atm')
0 files changed, 0 insertions, 0 deletions