Merge branch 'topic/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 22 Jun 2009 15:03:39 +0000 (17:03 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 22 Jun 2009 15:03:39 +0000 (17:03 +0200)
commit70052413e7b432ccef8ee82340fc01831a1a290c
treeeb38fafcbfc2467c7a3931da600e2c68a6d5fc32
parent47166281d2dc9daf7da9a5ad88491ae94366e852
parent92a6ad34282f8403c4eb83025a2790af86cdb6bd
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