Commit 677d1bb0 authored May 22, 2014 by Linus Torvalds

Merge tag 'stable/for-linus-3.15-rc5-tag' of...

Merge tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft

Pull iscsi_ibft fix from Konrad Rzeszutek Wilk:
 "Fix iBFT regression on Broadcom NICs introduced in 3.2"

* tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
  iscsi_ibft: Fix finding Broadcom specific ibft sign

parents f6ce579d 629c27aa

drivers/firmware/iscsi_ibft.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -756,6 +756,7 @@ static const struct {
	*/		*/
	{ ACPI_SIG_IBFT },		{ ACPI_SIG_IBFT },
	{ "iBFT" },		{ "iBFT" },
			{ "BIFT" }, /* Broadcom iSCSI Offload */
	};		};

	static void __init acpi_find_ibft_region(void)		static void __init acpi_find_ibft_region(void)