From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Mar 2016 00:10:17 +0000 (-0700)
Subject: Merge branch 'stable/for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7bb7a74886ce1f88d727ba46faa05edcdbacc192;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

Pull iscsi_ibft update from Konrad Rzeszutek Wilk:
 "A simple patch that had been rattling around in SuSE repo"

* 'stable/for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
  iscsi_ibft: Add prefix-len attr and display netmask
---

7bb7a74886ce1f88d727ba46faa05edcdbacc192