8250: three way resolve of the 8250 diffs
authorAlan Cox <alan@linux.intel.com>
Tue, 17 Jul 2012 16:06:20 +0000 (17:06 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Jul 2012 16:11:50 +0000 (09:11 -0700)
commitce7240e445303de3ca66e6d08f17a2ec278a5bf6
tree8ee84f5ae903dcd72e0641ae4932da71cd9a7b4b
parent9833facf90c625f9757295bda6d970f82132b7be
8250: three way resolve of the 8250 diffs

This resolves the differences between the original 8250 patch, the revised 8250 patch
and the independant clean up of the octeon driver (to use platform devices properly yay!)

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/char/mwave/mwavedd.c
drivers/misc/ibmasm/uart.c
drivers/net/ethernet/sgi/ioc3-eth.c
drivers/tty/serial/8250/8250.h
drivers/tty/serial/8250/8250_dw.c
drivers/tty/serial/of_serial.c
include/linux/serial_8250.h