| commit | 035f5afb022451b6b4f7ca1ff65a43d7ea8154a1 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Wed Apr 15 11:24:14 2009 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Wed Apr 15 11:24:14 2009 +0200 |
| tree | dafb62ca4cc56b2d0cef6bf916ad87bce0826a40 | |
| parent | 2e8e59f437ce303fde2077cc5f84ce03c6ff1020 [diff] | |
| parent | 34e51ce60a210094bd66cf0a75dd8512247618ca [diff] |
Merge branch 'topic/asoc' into for-linus * topic/asoc: ASoC: Disable S3C64xx support in Kconfig ASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h