Merge with rsync://fileserver/linux

author Thomas Gleixner <[email protected]>

Sun, 26 Jun 2005 21:20:36 +0000 (23:20 +0200)

committer Thomas Gleixner <[email protected]>

Sun, 26 Jun 2005 21:20:36 +0000 (23:20 +0200)
author Thomas Gleixner <[email protected]>
Sun, 26 Jun 2005 21:20:36 +0000 (23:20 +0200)
committer Thomas Gleixner <[email protected]>
Sun, 26 Jun 2005 21:20:36 +0000 (23:20 +0200)
diff --cc fs/Kconfig
Simple merge
diff --cc fs/jffs2/background.c
Simple merge
author	Thomas Gleixner <[email protected]>
	Sun, 26 Jun 2005 21:20:36 +0000 (23:20 +0200)
committer	Thomas Gleixner <[email protected]>
	Sun, 26 Jun 2005 21:20:36 +0000 (23:20 +0200)
		1	2
fs/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
fs/jffs2/background.c	patch \|	diff1 \|	diff2 \|	blob \| history