From 1c8746ebeeabdd2e01242a2cb07c83e8ef0d4596 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Mon, 31 Oct 2011 17:11:41 -0700 Subject: [PATCH] --- yaml --- r: 272198 b: refs/heads/master c: 1330b0dcf876201bda0872ea32d64c190384defc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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