From: David S. Miller Date: Tue, 3 Jun 2014 06:17:03 +0000 (-0700) Subject: Merge branch 'cnic' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1299b3c49b7119ae534284e4129032441f40a422;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.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 --- 1299b3c49b7119ae534284e4129032441f40a422