From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 10 Sep 2012 01:41:01 +0000 (+1000)
Subject: Merge remote-tracking branch 'v4l-dvb/master'
X-Git-Tag: next-20120910~82
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=873ca0a586aa0b74e4a59309ba95af6132de010e;p=karo-tx-linux.git

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

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

873ca0a586aa0b74e4a59309ba95af6132de010e