Conflicts: Documentation/powerpc/booting-without-of.txt drivers/atm/Makefile drivers/net/fs_enet/fs_enet-main.c drivers/pci/pci-acpi.c net/8021q/vlan.c net/iucv/iucv.c |
||
|---|---|---|
| .. | ||
| irnet.h | ||
| irnet_irda.c | ||
| irnet_irda.h | ||
| irnet_ppp.c | ||
| irnet_ppp.h | ||
| Kconfig | ||
| Makefile | ||