sparc: Merge include/asm-sparc{,64}/openpromio.h
authorSam Ravnborg <sam@ravnborg.org>
Thu, 5 Jun 2008 18:47:46 +0000 (11:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Jul 2008 04:38:36 +0000 (21:38 -0700)
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/asm-sparc64/openpromio.h

Simple merge