diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-11-09 08:52:22 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-11-09 08:52:22 +0100 |
commit | bcca5fa6d786755abe91f5856c9647a2ca2a51b6 (patch) | |
tree | 12a909ba4c04252e882bc8622f4aa86015d45720 /security/apparmor/sid.c | |
parent | 8d1c963a2e0c57dfe7f9c356389902e500cf1cfd (diff) | |
parent | 1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad (diff) |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'security/apparmor/sid.c')
0 files changed, 0 insertions, 0 deletions