diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:32:59 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:32:59 +0200 |
| commit | 05a33e3d6fdca6ae3f645cc7bca9c11a4476e84c (patch) | |
| tree | e0477cf734f93da64564a4457a45ab563f70f5d1 /kernel/ptrace.c | |
| parent | fa285190025d0b9a35ed0f6233bfaa721281e0f4 (diff) | |
| parent | f1bc07af9a9edc5c1d4bdd971f7099316ed2e405 (diff) | |
Merge branch 'topic/oxygen' into for-linus
* topic/oxygen:
sound: oxygen: work around MCE when changing volume
Diffstat (limited to 'kernel/ptrace.c')
0 files changed, 0 insertions, 0 deletions