Merge commit 'v2.6.35-rc6' into devicetree/next

Conflicts:
	arch/sparc/kernel/prom_64.c
This commit is contained in:
Grant Likely 2010-07-24 09:49:13 -06:00
commit 4e4f62bf73
997 changed files with 10330 additions and 201642 deletions