From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 22 Jun 2009 15:03:39 +0000 (+0200)
Subject: Merge branch 'topic/asoc' into for-linus
X-Git-Tag: v2.6.31-rc1~38^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=70052413e7b432ccef8ee82340fc01831a1a290c;p=linux.git

Merge branch 'topic/asoc' into for-linus

* topic/asoc:
  ASoC: Blackfin: update the bf5xx_i2s_resume parameters
  ASoC: Blackfin: keep better track of SPORT configuration state
---

70052413e7b432ccef8ee82340fc01831a1a290c