diff options
author | Steven Rostedt <srostedt@redhat.com> | 2012-08-16 11:35:39 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2012-08-16 11:35:39 -0400 |
commit | 341cc297155eed0eec39537de0e42947f1b44be5 (patch) | |
tree | 556e31b35b16e13f0a44489feb74318b3b312397 /MAINTAINERS | |
parent | bb33f79d9568fd197c5e006a168f88ffbfd3dbe3 (diff) | |
parent | 196ad09b956e63131e3d196e490a4dfbb85e875f (diff) |
Merge tag 'v3.4.9' into v3.4-rt
This is the 3.4.9 stable release
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 249426c940c7..148dc9822605 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5575,7 +5575,7 @@ F: Documentation/blockdev/ramdisk.txt F: drivers/block/brd.c RANDOM NUMBER DRIVER -M: Matt Mackall <mpm@selenic.com> +M: Theodore Ts'o" <tytso@mit.edu> S: Maintained F: drivers/char/random.c |