From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Jun 2015 16:03:54 +0000 (-0700)
Subject: Merge branch 'stable/for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~1682
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=7dedcca09e9a751fd14fdb8e9882d675b23b2c0e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'stable/for-linus-4.1' of git://git./linux/kernel/git/konrad/ibft

Pull iBFT fix from Konrad Rzeszutek Wilk:
 "One single fix from Chris to workaround UEFI platforms failing with
  iSCSI IBFT"

* 'stable/for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
  iscsi_ibft: filter null v4-mapped v6 addresses
---

7dedcca09e9a751fd14fdb8e9882d675b23b2c0e