Merge commit 'v2.6.39' into spi/next

author Grant Likely <[email protected]>

Fri, 20 May 2011 06:43:00 +0000 (00:43 -0600)

committer Grant Likely <[email protected]>

Fri, 20 May 2011 06:43:00 +0000 (00:43 -0600)
author Grant Likely <[email protected]>
Fri, 20 May 2011 06:43:00 +0000 (00:43 -0600)
committer Grant Likely <[email protected]>
Fri, 20 May 2011 06:43:00 +0000 (00:43 -0600)
diff --cc drivers/spi/dw_spi.c
Simple merge
diff --cc drivers/spi/dw_spi.h
Simple merge
author	Grant Likely <[email protected]>
	Fri, 20 May 2011 06:43:00 +0000 (00:43 -0600)
committer	Grant Likely <[email protected]>
	Fri, 20 May 2011 06:43:00 +0000 (00:43 -0600)
		1	2
drivers/spi/dw_spi.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/dw_spi.h	patch \|	diff1 \|	diff2 \|	blob \| history