diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-06 19:32:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-06 19:32:23 +1100 |
| commit | 749550cb657ae5fb896b3b33070ae48f37813d13 (patch) | |
| tree | 452df2cf177181e19d278620516820a8e842c298 /MAINTAINERS | |
| parent | f15bdb0606142344f1f53998468808733fc7d052 (diff) | |
| parent | 3cd43dcfaabf7ad3bcc86f8a3ff41709b297e1b8 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/mm/init.c
drivers/net/wireless/rt2x00/rt2800pci.c
fs/bio-integrity.c
mm/bounce.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 82f2df183022..73ec45016cad 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1675,7 +1675,6 @@ S: Maintained F: drivers/net/wireless/b43legacy/ BACKLIGHT CLASS/SUBSYSTEM -M: Richard Purdie <rpurdie@rpsys.net> M: Jingoo Han <jg1.han@samsung.com> S: Maintained F: drivers/video/backlight/ @@ -2387,7 +2386,7 @@ F: kernel/cpuset.c CRAMFS FILESYSTEM W: http://sourceforge.net/projects/cramfs/ -S: Orphan +S: Orphan / Obsolete F: Documentation/filesystems/cramfs.txt F: fs/cramfs/ |