Merge tag 'v3.17-rc4' into sched/core, to prevent conflicts with upcoming patches...
[pandora-kernel.git] / net / key /
drwxr-xr-x   ..
-rw-r--r-- 66 Makefile
-rw-r--r-- 103839 af_key.c