• Linus Torvalds's avatar
    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 867a89e0
    Linus Torvalds authored
    * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      [RAPIDIO] Change RapidIO doorbell source and target ID field to 16-bit
      [RAPIDIO] Add RapidIO connection info print out and re-training for broken connections
      [RAPIDIO] Add serial RapidIO controller support, which includes MPC8548, MPC8641
      [RAPIDIO] Add RapidIO node probing into MPC86xx_HPCN board id table
      [RAPIDIO] Add RapidIO node into MPC8641HPCN dts file
      [RAPIDIO] Auto-probe the RapidIO system size
      [RAPIDIO] Add OF-tree support to RapidIO controller driver
      [RAPIDIO] Add RapidIO multi mport support
      [RAPIDIO] Move include/asm-ppc/rio.h to asm-powerpc
      [RAPIDIO] Add RapidIO option to kernel configuration
      [RAPIDIO] Change RIO function mpc85xx_ to fsl_
      [POWERPC] Provide walk_memory_resource() for powerpc
      [POWERPC] Update lmb data structures for hotplug memory add/remove
      [POWERPC] Hotplug memory remove notifications for powerpc
      [POWERPC] windfarm: Add PowerMac 12,1 support
      [POWERPC] Fix building of pmac32 when CONFIG_NVRAM=m
      [POWERPC] Add IRQSTACKS support on ppc32
      [POWERPC] Use __always_inline for xchg* and cmpxchg*
      [POWERPC] Add fast little-endian switch system call
    867a89e0
asm-offsets.c 16 KB