diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 13:09:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 13:09:35 -0700 |
| commit | 59a7ac12110f27951c6f754b4e451a9df686aea9 (patch) | |
| tree | 4f824b721e44f92388fcbc0471541a34a2709d43 /MAINTAINERS | |
| parent | f99b7880cb9863e11441bd8b2f31d4f556ef1a44 (diff) | |
| parent | cc8f9b99ed9b728e4dd154337a4332cda9e6d38b (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6: (32 commits)
MAINTAINERS: change e-mail of Adrian Hunter
UBIFS: fix master node recovery
UBIFS: improve power cut emulation testing
UBIFS: rename recovery testing variables
UBIFS: remove custom list of superblocks
UBIFS: stop re-defining UBI operations
UBIFS: switch to I/O helpers
UBIFS: switch to ubifs_leb_write
UBIFS: switch to ubifs_leb_read
UBIFS: introduce more I/O helpers
UBIFS: always print stacktrace when switching to R/O mode
UBIFS: remove unused and unneeded debugging function
UBIFS: add global debugfs knobs
UBIFS: introduce debugfs helpers
UBIFS: re-arrange debugging code a bit
UBIFS: be more informative in failure mode
UBIFS: switch self-check knobs to debugfs
UBIFS: lessen amount of debugging check types
UBIFS: introduce helper functions for debugging checks and tests
UBIFS: amend debugging inode size check function prototype
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 187282da9213..72b979d5076b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,4 +1,5 @@ + List of maintainers and how to submit kernel changes Please try to follow the guidelines below. This will make things @@ -6321,7 +6322,7 @@ F: drivers/scsi/u14-34f.c UBI FILE SYSTEM (UBIFS) M: Artem Bityutskiy <dedekind1@gmail.com> -M: Adrian Hunter <adrian.hunter@nokia.com> +M: Adrian Hunter <adrian.hunter@intel.com> L: linux-mtd@lists.infradead.org T: git git://git.infradead.org/ubifs-2.6.git W: http://www.linux-mtd.infradead.org/doc/ubifs.html |