diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 20:18:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 20:18:11 -0500 |
commit | 41630959ed5ce694ec2e8c0f3c69743e011394c8 (patch) | |
tree | 868cfa36577ebfad69f78180656cdca313c7498d /MAINTAINERS | |
parent | 2b8c70b2174402ca3dec13310ce56597233392d7 (diff) | |
parent | c4d1409bbed8cf2a11b48ce3a075e142f686a588 (diff) |
Merge branch 'ibft-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6
* 'ibft-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6:
ibft: Update MAINTAINERS file.
drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5f8c20600e20..a0491af7b243 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2410,6 +2410,12 @@ L: virtualization@lists.linux-foundation.org | |||
2410 | S: Maintained | 2410 | S: Maintained |
2411 | F: drivers/char/virtio_console.c | 2411 | F: drivers/char/virtio_console.c |
2412 | 2412 | ||
2413 | iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER | ||
2414 | M: Peter Jones <pjones@redhat.com> | ||
2415 | M: Konrad Rzeszutek Wilk <konrad@kernel.org> | ||
2416 | S: Maintained | ||
2417 | F: drivers/firmware/iscsi_ibft* | ||
2418 | |||
2413 | GSPCA FINEPIX SUBDRIVER | 2419 | GSPCA FINEPIX SUBDRIVER |
2414 | M: Frank Zago <frank@zago.net> | 2420 | M: Frank Zago <frank@zago.net> |
2415 | L: linux-media@vger.kernel.org | 2421 | L: linux-media@vger.kernel.org |