summaryrefslogtreecommitdiff
path: root/drivers/misc/ibmasm/i2o.h
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-07-17 20:06:20 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-17 20:11:50 +0400
commitce7240e445303de3ca66e6d08f17a2ec278a5bf6 (patch)
tree8ee84f5ae903dcd72e0641ae4932da71cd9a7b4b /drivers/misc/ibmasm/i2o.h
parent9833facf90c625f9757295bda6d970f82132b7be (diff)
downloadlinux-ce7240e445303de3ca66e6d08f17a2ec278a5bf6.tar.xz
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>
Diffstat (limited to 'drivers/misc/ibmasm/i2o.h')
0 files changed, 0 insertions, 0 deletions