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