From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 13 Jun 2008 19:49:07 +0000 (+0200)
Subject: sparc: Merge asm-sparc{,64}/asi.h
X-Git-Tag: v2.6.27-rc1~959^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdc3135ac99efd59de084a309751ec76887e62d8;p=pandora-kernel.git

sparc: Merge asm-sparc{,64}/asi.h

Joined the two files as they contain distinct definitions.
Inspired by patch from: Adrian Bunk <bunk@kernel.org>

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Adrian Bunk <bunk@kernel.org>
---

Reading git-diff-tree failed