Paul Mackerras aa43f77939 Merge branch 'merge'

2006-08-31 15:45:48 +10:00

..

Kconfig

…

Makefile

…

misc.c

…

mpc83xx.h

…

mpc834x_itx.c

Merge branch 'merge'

2006-08-31 15:45:48 +10:00

mpc834x_itx.h

…

mpc834x_sys.c

Merge branch 'merge'

2006-08-31 15:45:48 +10:00

mpc834x_sys.h

…

pci.c

Merge branch 'merge'

2006-08-31 15:45:48 +10:00