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)
* topic/asoc:
  ASoC: Disable S3C64xx support in Kconfig
  ASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h


Trivial merge