From: Grant Likely <grant.likely@secretlab.ca>
Date: Sat, 24 Jul 2010 15:49:13 +0000 (-0600)
Subject: Merge commit 'v2.6.35-rc6' into devicetree/next
X-Git-Tag: v2.6.36-rc1~543^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e4f62bf7396fca48efe61513640ee399a6046e3;p=pandora-kernel.git

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

Conflicts:
	arch/sparc/kernel/prom_64.c
---

4e4f62bf7396fca48efe61513640ee399a6046e3
Reading git-diff-tree failed