From: Mauro Carvalho Chehab Date: Wed, 2 Nov 2011 11:18:32 +0000 (-0200) Subject: Merge /home/v4l/v4l/patchwork X-Git-Tag: next-20111103~45^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=76ba028467efec92d61b002e1da41819129a4467;p=karo-tx-linux.git Merge /home/v4l/v4l/patchwork * /home/v4l/v4l/patchwork: staging/Makefile: Don't compile a media driver there --- 76ba028467efec92d61b002e1da41819129a4467