diff options
author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-08-30 21:49:20 +0200 |
---|---|---|
committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-08-30 21:49:20 +0200 |
commit | 2a4a7840c4bf66614b49c2828947f2cccb6ab36f (patch) | |
tree | a2b98163d6f4ae05a9f0557e484cc120603a42c6 /MAINTAINERS | |
parent | de60756ed5f5a5c82d5c799850148f68346e5918 (diff) | |
parent | 5aa287dcf1b5879aa0150b0511833c52885f5b4c (diff) | |
download | kernel_samsung_crespo-2a4a7840c4bf66614b49c2828947f2cccb6ab36f.zip kernel_samsung_crespo-2a4a7840c4bf66614b49c2828947f2cccb6ab36f.tar.gz kernel_samsung_crespo-2a4a7840c4bf66614b49c2828947f2cccb6ab36f.tar.bz2 |
Merge branch 'linux-3.0.y' into HEAD
Conflicts:
drivers/net/tun.c
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b0209fb..74c8e4b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5247,7 +5247,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 |