diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-25 15:28:14 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-25 15:28:14 +0200 |
| commit | 10121a12e2380fb34b6e646a8e367add06d036c3 (patch) | |
| tree | d500294174e67cbb208eaf5d7f9741be48eca8a6 /scripts/Makefile | |
| parent | Linux 2.6.31-rc1 (diff) | |
| parent | MAINTAINERS: Add entry for twl4030 series soc codec driver (diff) | |
| download | linux-10121a12e2380fb34b6e646a8e367add06d036c3.tar.xz linux-10121a12e2380fb34b6e646a8e367add06d036c3.zip | |
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Conflicts:
MAINTAINERS
Diffstat (limited to 'scripts/Makefile')
0 files changed, 0 insertions, 0 deletions