]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6108cd4 94bccc3)
Merge branch 'for-linus-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Jul 2019 16:43:43 +0000 (09:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Jul 2019 16:43:43 +0000 (09:43 -0700)
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

1  2 
drivers/firmware/Kconfig patch | diff1 | diff2 | blob | history
drivers/firmware/iscsi_ibft.c patch | diff1 | diff2 | blob | history

diff --cc drivers/firmware/Kconfig
Simple merge
diff --cc drivers/firmware/iscsi_ibft.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.