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
..
Kconfig	…
Makefile	…
amd76xrom.c	…
autcpu12-nvram.c	…
bfin-async-flash.c	…
cdb89712.c	…
ceiva.c	…
cfi_flagadm.c	…
ck804xrom.c	…
dbox2-flash.c	…
dc21285.c	…
dilnetpc.c	…
dmv182.c	…
edb7312.c	…
esb2rom.c	…
fortunet.c	…
gpio-addr-flash.c	…
h720x-flash.c	…
ichxrom.c	…
impa7.c	…
integrator-flash.c	…
intel_vr_nor.c	…
ixp4xx.c	…
ixp2000.c	…
l440gx.c	…
map_funcs.c	…
mbx860.c	…
netsc520.c	…
nettel.c	…
octagon-5066.c	…
pci.c	…
pcmciamtd.c	…
physmap.c	…
physmap_of.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
pismo.c	…
plat-ram.c	…
pmcmsp-flash.c	…
pxa2xx-flash.c	…
rbtx4939-flash.c	…
redwood.c	…
rpxlite.c	…
sa1100-flash.c	…
sbc_gxx.c	…
sc520cdp.c	…
scb2_flash.c	…
scx200_docflash.c	…
solutionengine.c	…
sun_uflash.c	…
tqm8xxl.c	…
ts5500_flash.c	…
tsunami_flash.c	…
uclinux.c	…
vmax301.c	…
vmu-flash.c	…
wr_sbc82xx_flash.c	…