diff --git a/[refs] b/[refs] index 75d2bbb7dd0e..042b081d434e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6777376e0d5b579e645c76effec4b8b4f0cbff82 +refs/heads/master: 450500ad1d58d5b1dcfeb342fa737eaf35f9d31a diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 5e47a5d3c96f..d691e0e196b1 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -464,6 +464,14 @@ S: Maintained F: drivers/scsi/aic7xxx/ F: drivers/scsi/aic7xxx_old/ +AIMSLAB FM RADIO RECEIVER DRIVER +M: Hans Verkuil +L: linux-media@vger.kernel.org +T: git git://linuxtv.org/media_tree.git +W: http://linuxtv.org +S: Maintained +F: drivers/media/radio/radio-aimslab* + AIO M: Benjamin LaHaise L: linux-aio@kvack.org