Mark Brown 18d4ed4342 Merge branch 'for-3.1' into for-3.2
Conflict due to the fix for the register map failure - taken the for-3.1
version.

Conflicts:
	sound/soc/codecs/sgtl5000.c
2011-08-08 14:56:19 +09:00
..
2011-05-26 19:45:34 +02:00
2011-07-31 23:28:23 +02:00
2011-05-26 19:45:16 +02:00
2011-05-24 22:19:37 +02:00
2011-05-24 22:18:57 +02:00
2011-07-31 23:28:25 +02:00
2011-07-20 17:20:57 -04:00
2011-07-31 23:28:23 +02:00
2011-07-31 23:28:22 +02:00