| commit | ce7240e445303de3ca66e6d08f17a2ec278a5bf6 | [log] [tgz] |
|---|---|---|
| author | Alan Cox <alan@linux.intel.com> | Tue Jul 17 17:06:20 2012 +0100 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Jul 17 09:11:50 2012 -0700 |
| tree | 8ee84f5ae903dcd72e0641ae4932da71cd9a7b4b | |
| parent | 9833facf90c625f9757295bda6d970f82132b7be [diff] |
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>