diff --git a/[refs] b/[refs] index 1393df333843..a83af095d888 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03535ab54a3f3ead011c14b98f2781a285f95025 +refs/heads/master: 1330b0dcf876201bda0872ea32d64c190384defc diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index a9837f23aae9..3c17a201af54 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -316,6 +316,10 @@ W: http://wiki.analog.com/AD7879 S: Supported F: drivers/input/touchscreen/ad7879.c +ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR) +M: Jiri Kosina +S: Maintained + ADM1025 HARDWARE MONITOR DRIVER M: Jean Delvare L: lm-sensors@lm-sensors.org