diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-02 23:17:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-02 23:17:03 -0700 |
| commit | 1299b3c49b7119ae534284e4129032441f40a422 (patch) | |
| tree | 9f6b56c5dd8b707327864ecfdaf667cc4db29acb /net/xfrm | |
| parent | 74f43922dc985119fa84c19c648445f81d0c7706 (diff) | |
| parent | 5943691442ae248977a2e3cac814ed5ac606903c (diff) | |
| download | linux-1299b3c49b7119ae534284e4129032441f40a422.tar.gz linux-1299b3c49b7119ae534284e4129032441f40a422.tar.bz2 linux-1299b3c49b7119ae534284e4129032441f40a422.zip | |
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>
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions