diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-12-07 17:33:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-07 17:33:09 +0100 |
| commit | ffe7e4063987678c00589717d7871f837c6e7300 (patch) | |
| tree | 1aeee46780d9f7601909a4baa5f0c766c555e2e2 /security/selinux/hooks.c | |
| parent | 9eb6e9b16f86ef94f05427bd7fc84d521aa57169 (diff) | |
| parent | 0a34b42b6245ccc710be6759cded5b7fe41ea1f9 (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'security/selinux/hooks.c')
0 files changed, 0 insertions, 0 deletions