1
0
Fork 0
alistair23-linux/fs/ubifs
Artem Bityutskiy 7cce2f4cb7 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into linux-next
Conflicts:
	fs/ubifs/super.c

Merge the upstream tree in order to resolve a conflict with the
per-bdi writeback changes from the linux-2.6-block tree.
2009-09-21 12:09:22 +03:00
..
Kconfig trivial: fix typos/grammar errors in Kconfig texts 2009-03-30 15:22:01 +02:00
Makefile UBIFS: include to compilation 2008-07-15 17:35:24 +03:00
budget.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into linux-next 2009-09-21 12:09:22 +03:00
commit.c UBIFS: suppress compilation warning 2009-07-24 15:14:54 +03:00
compress.c UBIFS: fix sparse warnings 2008-12-31 14:13:24 +02:00
debug.c UBIFS: fix debugging dump 2009-09-17 15:08:31 +03:00
debug.h UBIFS: improve journal head debugging prints 2009-09-15 17:05:06 +03:00
dir.c UBIFS: return error if link and unlink race 2009-05-19 11:01:31 +03:00
file.c UBIFS: amend commentaries 2009-09-10 12:06:47 +03:00
find.c UBIFS: improve find function interface 2009-03-08 13:29:09 +02:00
gc.c UBIFS: do not print scary error messages needlessly 2009-09-10 12:06:47 +03:00
io.c UBIFS: improve journal head debugging prints 2009-09-15 17:05:06 +03:00
ioctl.c headers: smp_lock.h redux 2009-07-12 12:22:34 -07:00
journal.c UBIFS: improve journal head debugging prints 2009-09-15 17:05:06 +03:00
key.h UBIFS: add inode size debugging check 2009-09-10 09:58:11 +03:00
log.c UBIFS: improve journal head debugging prints 2009-09-15 17:05:06 +03:00
lprops.c UBIFS: improve lprops dump 2009-09-15 17:09:48 +03:00
lpt.c UBIFS: use nicer 64-bit math 2008-12-23 12:23:40 +02:00
lpt_commit.c UBIFS: fix commentaries 2009-03-20 19:11:12 +02:00
master.c UBIFS: check ubifs_scan error codes better 2009-09-10 12:06:47 +03:00
misc.h UBIFS: inline one-line functions 2008-09-30 11:12:56 +03:00
orphan.c UBIFS: check ubifs_scan error codes better 2009-09-10 12:06:47 +03:00
recovery.c UBIFS: do not print scary error messages needlessly 2009-09-10 12:06:47 +03:00
replay.c UBIFS: do not print scary error messages needlessly 2009-09-10 12:06:47 +03:00
sb.c UBIFS: add R/O compatibility 2009-03-26 16:36:20 +02:00
scan.c UBIFS: do not print scary error messages needlessly 2009-09-10 12:06:47 +03:00
shrinker.c UBIFS: list usage cleanup 2009-02-17 12:45:22 +02:00
super.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into linux-next 2009-09-21 12:09:22 +03:00
tnc.c UBIFS: add inode size debugging check 2009-09-10 09:58:11 +03:00
tnc_commit.c UBIFS: do not print scary error messages needlessly 2009-09-10 12:06:47 +03:00
tnc_misc.c UBIFS: correct key comparison 2008-09-30 11:12:57 +03:00
ubifs-media.h UBIFS: define journal head numbers in ubifs-media.h 2009-09-15 14:45:35 +03:00
ubifs.h UBIFS: improve lprops dump 2009-09-15 17:09:48 +03:00
xattr.c UBIFS: constify file and inode operations 2009-08-22 11:54:51 +03:00