Android SDK / linux-phytec-ti / dc2af52c0d6

Commits

f1992dde7fe + 36be50515fe

Mark Brown committed dc2af52c0d6M13 May 2012

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

Linux 3.4-rc7

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

Showing diff tof1992dde7fe