From: Grant Likely <grant.likely@secretlab.ca>
Date: Sat, 12 Mar 2011 08:25:53 +0000 (-0700)
Subject: Merge commit 'v2.6.38-rc8' into spi/next
X-Git-Tag: v2.6.39-rc1~417^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c3c8afccb6a163fd2be739f511e863eab668702;p=pandora-kernel.git

Merge commit 'v2.6.38-rc8' into spi/next

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

9c3c8afccb6a163fd2be739f511e863eab668702
Reading git-diff-tree failed