diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2010-11-23 12:45:05 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-23 12:45:05 +0100 |
| commit | 2ab46c9390e74368a38ddb5aa525124518df8b69 (patch) | |
| tree | 631e686fb11709add69f07b4fd1e5aaa10f232de /tools/perf/scripts/python/bin | |
| parent | Merge branch 'next-samsung-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into for-2.6.38 (diff) | |
| parent | ASoC: Move kfree(twl4030) to twl4030_soc_remove() (diff) | |
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc
Conflicts:
sound/soc/codecs/tpa6130a2.c
Diffstat (limited to 'tools/perf/scripts/python/bin')
0 files changed, 0 insertions, 0 deletions