Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial: [ARM] 3383/3: ixp2000: ixdp2x01 platform serial conversion [SERIAL] amba-pl010: Remove accessor macros [SERIAL] remove 8250_acpi (replaced by 8250_pnp and PNPACPI) [SERIAL] icom: select FW_LOADER
Showing
- arch/arm/mach-ixp2000/ixdp2x01.c 59 additions, 19 deletionsarch/arm/mach-ixp2000/ixdp2x01.c
- drivers/serial/8250_acpi.c 0 additions, 183 deletionsdrivers/serial/8250_acpi.c
- drivers/serial/Kconfig 1 addition, 8 deletionsdrivers/serial/Kconfig
- drivers/serial/Makefile 0 additions, 1 deletiondrivers/serial/Makefile
- drivers/serial/amba-pl010.c 49 additions, 61 deletionsdrivers/serial/amba-pl010.c
- include/linux/serial_8250.h 1 addition, 0 deletionsinclude/linux/serial_8250.h
Loading
Please register or sign in to comment