From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 26 Sep 2012 01:13:42 +0000 (+1000)
Subject: Merge remote-tracking branch 'v4l-dvb/master'
X-Git-Tag: next-20120926~83
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e03396ba424ffdac317b20458e2a110576f81c78;p=karo-tx-linux.git

Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
	arch/arm/mach-imx/mach-imx27_visstrim_m10.c
---

e03396ba424ffdac317b20458e2a110576f81c78