diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-07 09:05:15 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-07 09:05:15 +0100 |
| commit | fc7a1627c11bb6e4eb71fd8f792109754175f7bc (patch) | |
| tree | 91dc5448a151d8fb57288a7cdef26c719fe02963 /scripts/selinux | |
| parent | 78f8baf138311be3e170526388b0530a172bdbff (diff) | |
| parent | 526af6eb4dc71302f59806e2ccac7793963a7fe0 (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'scripts/selinux')
0 files changed, 0 insertions, 0 deletions