summaryrefslogtreecommitdiff
path: root/net/key/af_key.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-09 17:01:26 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-09 17:01:26 -0800
commitac73fddfc523bf3c3525d16356b44527c44fae6d (patch)
tree77c22e04557e35168b1df43e1018a4f8241df224 /net/key/af_key.c
parent3af9cf11b6efb82aa7a1a24e2382b75d43631c4e (diff)
parentef286f6fa673cd7fb367e1b145069d8dbfcc6081 (diff)
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md: md: fix some lockdep issues between md and sysfs. md: fix 'degraded' calculation when starting a reshape.
Diffstat (limited to 'net/key/af_key.c')
0 files changed, 0 insertions, 0 deletions