Compare: e675349e2bdbfb661fa0 vs b1721d0da266b4af8cb4

kisskb

Description:	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2	v4l/dvb: add statics to avoid multiple definitions
Date:	April 19, 2008, 4:15 a.m.	April 26, 2008, 1:01 p.m.
Hash:	e675349e2bdbfb661fa0d8ff2441b4cf48fb7e48	b1721d0da266b4af8cb4419473b4ca36206ab200
Branches:	linus	linus
Gitweb:	git.kernel.org	git.kernel.org
Progress:	3% 6/194	17% 33/194
Successful:	83% 5/6	63% 21/33
Previous:	253ba4e79edc695b2925 (compare)	3dd7b71ca0f7ff8410a6 (compare)
Next:	2cca775baecbfede2fec (compare)	4a27214d7be31e122db4 (compare)

Status	Date/time	Target	Status	Date/time	Target
OK	Apr 19 2008, 04:56	linus/s390-allmodconfig/s390x-gcc4.6	Failed	Apr 26 2008, 15:10	linus/s390-allmodconfig/s390x-gcc4.6
OK	Apr 19 2008, 04:52	linus/ia64-defconfig/ia64-gcc4.6	Failed	Apr 26 2008, 15:09	linus/ia64-defconfig/ia64-gcc4.6
OK	Apr 19 2008, 04:49	linus/s390-defconfig/s390x-gcc4.6	Failed	Apr 26 2008, 15:08	linus/s390-defconfig/s390x-gcc4.6
OK	Apr 19 2008, 04:48	linus/versatile_defconfig/arm-gcc4.6	Failed	Apr 26 2008, 15:08	linus/versatile_defconfig/arm-gcc4.6
OK	Apr 19 2008, 04:46	linus/m68k-defconfig/m68k-gcc8	Failed	Apr 26 2008, 15:07	linus/m68k-defconfig/m68k-gcc8