cf9b59e9d3
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> |
||
---|---|---|
.. | ||
altera_ps2.c | ||
ambakmi.c | ||
ams_delta_serio.c | ||
at32psif.c | ||
ct82c710.c | ||
gscps2.c | ||
hil_mlc.c | ||
hp_sdc_mlc.c | ||
hp_sdc.c | ||
i8042-io.h | ||
i8042-ip22io.h | ||
i8042-jazzio.h | ||
i8042-ppcio.h | ||
i8042-snirm.h | ||
i8042-sparcio.h | ||
i8042-x86ia64io.h | ||
i8042.c | ||
i8042.h | ||
Kconfig | ||
libps2.c | ||
maceps2.c | ||
Makefile | ||
parkbd.c | ||
pcips2.c | ||
q40kbd.c | ||
rpckbd.c | ||
sa1111ps2.c | ||
serio_raw.c | ||
serio.c | ||
serport.c | ||
xilinx_ps2.c |