From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Dec 2011 01:08:04 +0000 (+1100)
Subject: Merge remote-tracking branch 'v4l-dvb/master'
X-Git-Tag: next-20111214~68
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=773d6d0e38620be86492516cce22a5b5dbb98fd4;p=karo-tx-linux.git

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

Conflicts:
	drivers/staging/media/as102/as102_drv.h
---

773d6d0e38620be86492516cce22a5b5dbb98fd4