Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ... Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge. Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>		2010-05-22 00:36:56 -06:00
..
alauda.c
ams-delta.c
atmel_nand_ecc.h
atmel_nand.c
au1550nd.c
autcpu12.c
bcm_umi_bch.c
bcm_umi_nand.c
bf5xx_nand.c
cafe_nand.c
cmx270_nand.c
cs553x_nand.c
davinci_nand.c
denali.c
denali.h
diskonchip.c
edb7312.c
fsl_elbc_nand.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
fsl_upm.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
gpio.c
h1910.c
Kconfig
Makefile
mpc5121_nfc.c
mxc_nand.c
nand_base.c
nand_bbt.c
nand_bcm_umi.c
nand_bcm_umi.h
nand_ecc.c
nand_ids.c
nandsim.c
ndfc.c
nomadik_nand.c
nuc900_nand.c
omap2.c
orion_nand.c
pasemi_nand.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
plat_nand.c
ppchameleonevb.c
pxa3xx_nand.c
r852.c
r852.h
rtc_from4.c
s3c2410.c
sh_flctl.c
sharpsl.c
sm_common.c
sm_common.h
socrates_nand.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
spia.c
tmio_nand.c
txx9ndfmc.c