Merge branch 'topic/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 15 Apr 2009 09:24:14 +0000 (11:24 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 15 Apr 2009 09:24:14 +0000 (11:24 +0200)
commit035f5afb022451b6b4f7ca1ff65a43d7ea8154a1
treedafb62ca4cc56b2d0cef6bf916ad87bce0826a40
parent2e8e59f437ce303fde2077cc5f84ce03c6ff1020
parent34e51ce60a210094bd66cf0a75dd8512247618ca
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