From: Grant Likely <grant.likely@secretlab.ca>
Date: Mon, 28 Feb 2011 08:36:21 +0000 (-0700)
Subject: Merge commit 'v2.6.38-rc6' into devicetree/next
X-Git-Tag: v2.6.39-rc1~466^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38a5d6736e7f714cc56d58692001e66dcbb98799;p=pandora-kernel.git

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

Conflicts:
	drivers/spi/pxa2xx_spi_pci.c
---

38a5d6736e7f714cc56d58692001e66dcbb98799
Reading git-diff-tree failed