Merge branch 'merge'
commit8a3e1c670e503ddd6f6c373b307f38b783ee3a50
authorPaul Mackerras <paulus@samba.org>
Mon, 9 Jun 2008 02:19:41 +0000 (9 12:19 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 9 Jun 2008 02:19:41 +0000 (9 12:19 +1000)
tree03094e8425b750d2693a271ebc89b49312e5476a
parente026892c85571e12f11abffde5a90bcc704d663e
parent60d5019be8acef268f4676d229c490186d338fbc
Merge branch 'merge'

Conflicts:

arch/powerpc/sysdev/fsl_soc.c
arch/powerpc/boot/Makefile
arch/powerpc/boot/dts/mpc8610_hpcd.dts
arch/powerpc/sysdev/fsl_soc.c
drivers/net/Kconfig