Merge remote branch 'origin' into secretlab/next-spi
Grant Likely [Tue, 25 May 2010 06:38:26 +0000 (00:38 -0600)]
1  2 
drivers/serial/mpc52xx_uart.c
drivers/spi/Kconfig
drivers/spi/spi_mpc8xxx.c

Simple merge
Simple merge
Simple merge