diff --git a/[refs] b/[refs] index 95cfbede6745..a13af2fff846 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 569530fb1b40ab2d2ca147ee79898ac807ebdf90 +refs/heads/master: 3971dae51d7cccf4c8197786b050b3a65ace01f0 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index a1270978eb41..a068fe457f7a 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5118,6 +5118,11 @@ F: drivers/i2c/busses/i2c-pca-* F: include/linux/i2c-algo-pca.h F: include/linux/i2c-pca-platform.h +PCDP - PRIMARY CONSOLE AND DEBUG PORT +M: Khalid Aziz +S: Maintained +F: drivers/firmware/pcdp.* + PCI ERROR RECOVERY M: Linas Vepstas L: linux-pci@vger.kernel.org