diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-05-24 00:45:06 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-05-24 00:45:06 -0700 |
| commit | 9b28b11e2a648f07c8481b9666ccf1c088e1ab74 (patch) | |
| tree | ac3db2d4ae69e393d8423bb8c9304c75023dc805 /net/key/af_key.c | |
| parent | b7679ab3f70482ff4b75a8c735c8224ebedb6020 (diff) | |
| parent | 99aa18278e867574d72201b806f82ace07d4804b (diff) | |
Merge branch 'for_2.6.40/pm-cleanup' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'net/key/af_key.c')
0 files changed, 0 insertions, 0 deletions