From 69394f022427a3b3943f1c2b31ba33dcde898985 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 10 Jan 2012 15:08:49 -0800 Subject: [PATCH] --- yaml --- r: 283039 b: refs/heads/master c: 25b8d2b4fc4fd9f9ae7f95ce76bc47712c99809e h: refs/heads/master i: 283037: 3cd58b54acc9fff89fd2d6b4f6588b1ad33e9781 283035: a0d9de65088fafa646c71d382c427b33e53cbdc3 283031: 06507ad18eae4fcaf67f13ff0ab577d67a852e77 283023: a23bf48d20f8d92ee3b7c3cfbfb4527f98231761 283007: 848b852ed9df07f1b434662924674f33d27e498f v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 83c1d9343b7c..856facd7a41d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72dbb7051334c37c9210cd735684c304da8a5e85 +refs/heads/master: 25b8d2b4fc4fd9f9ae7f95ce76bc47712c99809e diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 04716db6078f..75da19d890f6 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1659,7 +1659,7 @@ L: linux-media@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git S: Maintained F: Documentation/video4linux/cafe_ccic -F: drivers/media/video/cafe_ccic* +F: drivers/media/video/marvell-ccic/ CAIF NETWORK LAYER M: Sjur Braendeland