Merge ../linux-2.6

author Tony Lindgren <tony@atomide.com>

Thu, 20 Sep 2007 17:06:48 +0000 (10:06 -0700)

committer Tony Lindgren <tony@atomide.com>

Thu, 20 Sep 2007 17:06:48 +0000 (10:06 -0700)
author Tony Lindgren <tony@atomide.com>
Thu, 20 Sep 2007 17:06:48 +0000 (10:06 -0700)
committer Tony Lindgren <tony@atomide.com>
Thu, 20 Sep 2007 17:06:48 +0000 (10:06 -0700)
diff --cc Makefile
Simple merge
diff --cc arch/arm/vfp/vfpmodule.c
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Thu, 20 Sep 2007 17:06:48 +0000 (10:06 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 20 Sep 2007 17:06:48 +0000 (10:06 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/vfp/vfpmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history