From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 10 Nov 2014 16:59:43 +0000 (+0100)
Subject: Merge branch 'asm-generic-io' of https://github.com/thierryreding/linux into asm... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1d0eeac7772d78b269a1c39fc9d685adf029acdf;p=deliverable%2Flinux.git

Merge branch 'asm-generic-io' of https://github.com/thierryreding/linux into asm-generic

Pull asm-generic/io.h overhaul from Thierry Reding

* 'asm-generic-io' of https://github.com/thierryreding/linux:
  arm64: Use include/asm-generic/io.h
  ARM: Use include/asm-generic/io.h
  asm-generic/io.h: Implement generic {read,write}s*()
  asm-generic/io.h: Reconcile I/O accessor overrides
  /dev/mem: Use more consistent data types
  Change xlate_dev_{kmem,mem}_ptr() prototypes
  ARM: ixp4xx: Properly override I/O accessors
  ARM: ixp4xx: Fix build with IXP4XX_INDIRECT_PCI
  ARM: ebsa110: Properly override I/O accessors
  ARC: Remove redundant PCI_IOBASE declaration

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

1d0eeac7772d78b269a1c39fc9d685adf029acdf