sound/soc/blackfin/bf5xx-ssm2602.c · 0b34ac810ac079735f9e7e2c58d467f849a67ede · Kirill Smelkov / linux

Merge tag 'v3.4-rc7' into for-3.5 · dc2af52c

Mark Brown authored May 13, 2012

Linux 3.4-rc7

Conflicts):
	drivers/base/regmap/regmap.c         (overlap with bug fixes)
	sound/soc/blackfin/bf5xx-ssm2602.c   (overlap with bug fixes)

dc2af52c

bf5xx-ssm2602.c 3.51 KB

Replace bf5xx-ssm2602.c