Paul Mackerras 8a3e1c670e Merge branch 'merge' ... Conflicts: arch/powerpc/sysdev/fsl_soc.c		2008-06-09 12:19:41 +10:00
..
base.c	[POWERPC] Add null pointer check to of_find_property	2008-05-15 20:49:49 +10:00
device.c	[POWERPC] Move of_device_get_modalias to drivers/of	2008-05-16 23:22:28 +10:00
gpio.c	[POWERPC] of/gpio: Use dynamic base allocation	2008-05-23 15:27:19 +10:00
Kconfig
Makefile
of_i2c.c	rtc-ds1374: rename device to just "ds1374"	2008-06-06 11:29:10 -07:00
platform.c