tree eb38fafcbfc2467c7a3931da600e2c68a6d5fc32
parent 47166281d2dc9daf7da9a5ad88491ae94366e852
parent 92a6ad34282f8403c4eb83025a2790af86cdb6bd
author Takashi Iwai <tiwai@suse.de> 1245683019 +0200
committer Takashi Iwai <tiwai@suse.de> 1245683019 +0200

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