diff --git a/[refs] b/[refs] index b938ff139045..5161a91e61da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42b2aa86c6670347a2a07e6d7af0e0ecc8fdbff9 +refs/heads/master: 05183189ee5df8799b22c56d93f0f69b8490e33f diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 14b8688e7842..1aebed17ba0b 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3187,6 +3187,16 @@ M: William Irwin S: Maintained F: fs/hugetlbfs/ +Hyper-V CORE AND DRIVERS +M: K. Y. Srinivasan +M: Haiyang Zhang +L: devel@linuxdriverproject.org +S: Maintained +F: drivers/hv/ +F: drivers/hid/hid-hyperv.c +F: drivers/net/hyperv/ +F: drivers/staging/hv/ + I2C/SMBUS STUB DRIVER M: "Mark M. Hoffman" L: linux-i2c@vger.kernel.org @@ -6310,12 +6320,6 @@ M: David Täht S: Odd Fixes F: drivers/staging/frontier/ -STAGING - HYPER-V (MICROSOFT) -M: Hank Janssen -M: Haiyang Zhang -S: Odd Fixes -F: drivers/staging/hv/ - STAGING - INDUSTRIAL IO M: Jonathan Cameron L: linux-iio@vger.kernel.org