err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 78ab67d a205752)

author	David Woodhouse <dwmw2@infradead.org>
	Fri, 27 Apr 2007 18:16:19 +0000 (19:16 +0100)
committer	David Woodhouse <dwmw2@infradead.org>
	Fri, 27 Apr 2007 18:16:19 +0000 (19:16 +0100)
commit	d1da4e50e5d09f02c340927a4fcb7f54202fa033
tree	7f98317bdd45dbdb7644e9179891c5af6a3a8ef1	tree \| snapshot
parent	78ab67da1002d954ea4c3e2b441e2483c41f94e8	commit \| diff
parent	a205752d1ad2d37d6597aaae5a56fc396a770868	commit \| diff

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

drivers/mtd/Kconfig

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

drivers/mtd/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/jffs2/fs.c	diff1 \|	diff2 \|	blob \| history
fs/jffs2/os-linux.h	diff1 \|	diff2 \|	blob \| history
fs/jffs2/wbuf.c	diff1 \|	diff2 \|	blob \| history

Linux 2.6 source tree