diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 12:00:43 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 12:00:43 +0200 |
| commit | d71f4cece4bd97d05592836202fc04ff2e7817e3 (patch) | |
| tree | 6c877c7a938758b1323d9c97d46b9c536e618c69 /kernel/taskstats.c | |
| parent | Merge branch 'topic/hda' into for-linus (diff) | |
| parent | ASoC: tpa6130a2: Remove CPVSS and HPVdd supplies (diff) | |
| download | linux-d71f4cece4bd97d05592836202fc04ff2e7817e3.tar.xz linux-d71f4cece4bd97d05592836202fc04ff2e7817e3.zip | |
Merge branch 'topic/asoc' into for-linus
Conflicts:
sound/soc/codecs/ad1938.c
Diffstat (limited to 'kernel/taskstats.c')
0 files changed, 0 insertions, 0 deletions