• A
    Merge branch 'io' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into asm-generic · 1c8d2969
    Arnd Bergmann 提交于
    * 'io' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
      documentation: memory-barriers: clarify relaxed io accessor semantics
      x86: io: implement dummy relaxed accessor macros for writes
      tile: io: implement dummy relaxed accessor macros for writes
      sparc: io: implement dummy relaxed accessor macros for writes
      powerpc: io: implement dummy relaxed accessor macros for writes
      parisc: io: implement dummy relaxed accessor macros for writes
      mn10300: io: implement dummy relaxed accessor macros for writes
      m68k: io: implement dummy relaxed accessor macros for writes
      m32r: io: implement dummy relaxed accessor macros for writes
      ia64: io: implement dummy relaxed accessor macros for writes
      cris: io: implement dummy relaxed accessor macros for writes
      frv: io: implement dummy relaxed accessor macros for writes
      xtensa: io: remove dummy relaxed accessor macros for reads
      s390: io: remove dummy relaxed accessor macros for reads
      microblaze: io: remove dummy relaxed accessor macros
      asm-generic: io: implement relaxed accessor macros as conditional wrappers
    
    Conflicts:
    	include/asm-generic/io.h
    Signed-off-by: NArnd Bergmann <arnd@arndb.de>
    1c8d2969
io.h 17.0 KB