diff --git a/[refs] b/[refs] index cb4c90a6dbc1..1b82e2dbd500 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c815ca39a0aa9d438e7caf3c61b8beb22be10ed9 +refs/heads/master: d39b8420da85c8a8cc5a08c682ea3d7e95b49c26 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 124c811bb8d1..0a4652d223b4 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4193,6 +4193,14 @@ F: Documentation/isapnp.txt F: drivers/pnp/isapnp/ F: include/linux/isapnp.h +ISA RADIO MODULE +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-isa* + iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER M: Peter Jones M: Konrad Rzeszutek Wilk