From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Sep 2013 01:16:58 +0000 (+1000)
Subject: Merge remote-tracking branch 'v4l-dvb/master'
X-Git-Tag: next-20130919~47
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=74a5f97d07d88f8af93ef7a946373fa3d832d5a9;p=karo-tx-linux.git

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

Conflicts:
	drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
---

74a5f97d07d88f8af93ef7a946373fa3d832d5a9