From: David S. Miller <davem@davemloft.net>
Date: Tue, 3 Jun 2014 06:17:03 +0000 (-0700)
Subject: Merge branch 'cnic'
X-Git-Tag: v3.16-rc1~27^2~78^2~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1299b3c49b7119ae534284e4129032441f40a422;p=linux.git

Merge branch 'cnic'

Michael Chan says:

====================
cnic fixes

Fix 2 sleeping function from invalid context bugs and 1 missing iscsi netlink
message bug.

v2: Fixed typo in rcu_dereference_protected() and tested with CONFIG_PROVE_RCU
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

1299b3c49b7119ae534284e4129032441f40a422