Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
checkpoint.c	Merge branch 'next' into upstream-merge	2010-10-27 23:44:47 -04:00
commit.c	Merge branch 'next' into upstream-merge	2010-10-27 23:44:47 -04:00
journal.c	jbd2: fix /proc/fs/jbd2/<dev> when using an external journal	2010-11-17 21:46:26 -05:00
Kconfig	Revert "task_struct: make journal_info conditional"	2009-12-17 13:23:24 -08:00
Makefile	[PATCH] jbd2: rename jbd2 symbols to avoid duplication of jbd symbols	2006-10-11 11:14:15 -07:00
recovery.c	ext4: remove initialized but not read variables	2010-06-14 13:28:03 -04:00
revoke.c	remove SWRITE* I/O types	2010-08-18 01:09:01 -04:00
transaction.c	fix comment typos concerning "consistent"	2010-12-10 16:04:28 +01:00