1
0
Files
linux/drivers/base/regmap
Mark Brown fa2c8f4017 Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
resolved below within the FSI driver and allow the application of the
dmaeengine conversion that depends on this resolution.

Linux 3.3-rc4

Conflicts:
	sound/soc/sh/fsi.c
2012-02-19 18:35:12 -08:00
..
2012-01-23 14:01:18 +00:00
2011-11-20 20:56:34 +00:00
2012-02-01 10:08:15 +00:00