diff --git a/[refs] b/[refs] index b6e7a8d73331..b4f08dce1c96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00e7825b943f486e80ff1305cd0594d8791870f8 +refs/heads/master: c4d1409bbed8cf2a11b48ce3a075e142f686a588 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 317ed38826d7..0d8a948878e2 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2399,6 +2399,12 @@ L: virtualization@lists.linux-foundation.org S: Maintained F: drivers/char/virtio_console.c +iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER +M: Peter Jones +M: Konrad Rzeszutek Wilk +S: Maintained +F: drivers/firmware/iscsi_ibft* + GSPCA FINEPIX SUBDRIVER M: Frank Zago L: linux-media@vger.kernel.org