diff --git a/[refs] b/[refs] index fc3060356bc2..d816e2cf935e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd72d04a6dadfa7ff2aa6ee64b1d8fb09a3e4e08 +refs/heads/master: 9df0a2451000700a7acb2a717f735c761ffdc7d9 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index dac37677af11..915564eda145 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -7316,7 +7316,7 @@ F: drivers/staging/rtl8712/ STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER M: Teddy Wang S: Odd Fixes -F: drivers/staging/sm7xx/ +F: drivers/staging/sm7xxfb/ STAGING - SOFTLOGIC 6x10 MPEG CODEC M: Ben Collins