diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 22:14:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 22:14:48 -0400 |
| commit | 44c695b13bee558c73a89bc79f6253a4ba637386 (patch) | |
| tree | 4ffcef19658771ca47c0068b79951fdd91012853 /MAINTAINERS | |
| parent | eee33abe592da1763550e6e55b1cfb7fdc6a9b4c (diff) | |
| parent | 061125476039a9a998878468a6abe235b1cee347 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
UBIFS: fix corruption dump
UBIFS: clean up free space checking
UBIFS: small amendments in the LEB scanning code
UBIFS: dump a little more in case of corruptions
MAINTAINERS: update ahunter's e-mail address
UBIFS: allow more than one volume to be mounted
UBIFS: fix assertion warning
UBIFS: minor spelling and grammar fixes
UBIFS: fix 64-bit divisions in debug print
UBIFS: few spelling fixes
UBIFS: set write-buffer timout to 3-5 seconds
UBIFS: slightly optimize write-buffer timer usage
UBIFS: improve debugging messaged
UBIFS: fix integer overflow warning
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 494059d60134..9d1601ec1311 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5854,7 +5854,7 @@ UBI FILE SYSTEM (UBIFS) | |||
| 5854 | P: Artem Bityutskiy | 5854 | P: Artem Bityutskiy |
| 5855 | M: dedekind@infradead.org | 5855 | M: dedekind@infradead.org |
| 5856 | P: Adrian Hunter | 5856 | P: Adrian Hunter |
| 5857 | M: ext-adrian.hunter@nokia.com | 5857 | M: adrian.hunter@nokia.com |
| 5858 | L: linux-mtd@lists.infradead.org | 5858 | L: linux-mtd@lists.infradead.org |
| 5859 | T: git git://git.infradead.org/ubifs-2.6.git | 5859 | T: git git://git.infradead.org/ubifs-2.6.git |
| 5860 | W: http://www.linux-mtd.infradead.org/doc/ubifs.html | 5860 | W: http://www.linux-mtd.infradead.org/doc/ubifs.html |