diff --git a/[refs] b/[refs] index 9b7dd25f1c2a..754f280a9c85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f101d916b5b2b95d36369e1b2505720db2dcecb +refs/heads/master: 35e3540b9cc744b2334e8bf7f38cb1fa1552b008 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index c001ed68df19..0b8e2bb44049 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6156,6 +6156,14 @@ L: linux-hexagon@vger.kernel.org S: Supported F: arch/hexagon/ +QUICKCAM PARALLEL PORT WEBCAMS +M: Hans Verkuil +L: linux-media@vger.kernel.org +T: git git://linuxtv.org/media_tree.git +W: http://linuxtv.org +S: Odd Fixes +F: drivers/media/parport/*-qcam* + RADOS BLOCK DEVICE (RBD) M: Yehuda Sadeh M: Sage Weil