diff --git a/[refs] b/[refs] index f230de7b0743..1cb4adb1a74d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b32bfc3843f7fd090d30853d98866d923cfb8fff +refs/heads/master: 55a23c4af83df9c8fdf55690a09a3f0a92bd127b diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index a39449278a19..22116520e72a 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2811,7 +2811,7 @@ S: Maintained F: drivers/input/ INTEL FRAMEBUFFER DRIVER (excluding 810 and 815) -M: Sylvain Meyer +M: Maik Broemme L: linux-fbdev@vger.kernel.org S: Maintained F: Documentation/fb/intelfb.txt