git.stricted.de - GitHub/LineageOS/android_kernel_motorola

author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Sat, 22 Sep 2012 15:26:27 +0000 (11:26 -0400)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Sat, 22 Sep 2012 15:26:27 +0000 (11:26 -0400)
commit	ddfb43f3881edb47aa0083651ad31983cdc42c33
tree	7128cb13b599d2903a4deb05bbae37508b1c261e	tree \| snapshot (tar.gz zip)
parent	2d6d649a2e0fa0268c0d03d5b1d330ca7907d33c	commit \| diff
parent	5698bd757d55b1bb87edd1a9744ab09c142abfc2	commit \| diff

Merge tag 'v3.6-rc6' into for-3.7

Linux 3.6-rc6 has all our bug fixes.

Conflicts (trivial overlap):
sound/soc/omap/am3517evm.c

arch/arm/mach-omap2/omap_hwmod_44xx_data.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/twl4030-audio.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/arizona.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/mc13783.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8904.c	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-dapm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/ux500/ux500_msp_i2s.c	diff1 \|	diff2 \|	blob \| history