diff --git a/[refs] b/[refs] index f68a5988fb88..d97bbcded41a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c956126c137d97acb6f4d56fa9572d0bcc84e4ed +refs/heads/master: b7bbbf354ed0edbbffdc70c9c17f1a5d4d78204c diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index a3da87f82a75..9800de5ec222 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4838,12 +4838,10 @@ F: kernel/rcu* F: kernel/srcu* X: kernel/rcutorture.c -REAL TIME CLOCK DRIVER +REAL TIME CLOCK DRIVER (LEGACY) M: Paul Gortmaker S: Maintained -F: Documentation/rtc.txt -F: drivers/rtc/ -F: include/linux/rtc.h +F: drivers/char/rtc.c REAL TIME CLOCK (RTC) SUBSYSTEM M: Alessandro Zummo