From: Finn Thain <fthain@telegraphics.com.au>
Date: Wed, 12 Nov 2014 05:12:16 +0000 (+1100)
Subject: atari_NCR5380: Merge from sun3_NCR5380.c
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~21^2^2~64
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3f463b034bad82cd247d9a1b39209ba7152e545;p=pandora-kernel.git

atari_NCR5380: Merge from sun3_NCR5380.c

There is very little difference between the sun3_NCR5380.c core driver
and atari_NCR5380.c. The former is a fork of the latter.

Merge the sun3_NCR5380.c core driver into atari_NCR5380.c so that
sun3_scsi.c can adopt the latter and the former can be deleted.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---

Reading git-diff-tree failed