Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Jun 2011 11:26:02 +0000 (12:26 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Jun 2011 11:26:02 +0000 (12:26 +0100)
commitaa72f6899b9fb3dc824c458234ae3507a60e462d
tree97480a3cefc3d864ffd6eb994ec09ab5d680eabe
parente6a9be0bb018466896632969ba4b496d1a7caea9
parent05d3962cc921c51059df69488c7f70ab8b6a5d88
Merge branch 'for-3.0' into for-3.1
sound/soc/atmel/atmel_ssc_dai.c