Merge commit 'gcl/next' into next
Benjamin Herrenschmidt [Wed, 9 Dec 2009 06:10:22 +0000 (17:10 +1100)]
1  2 
arch/powerpc/platforms/52xx/mpc52xx_gpt.c
drivers/spi/Kconfig

Simple merge