tree 406cb663b9927b058cf879fd10814e465bf788a8
parent 23b7776290b10297fe2cae0fb5f166a4f2c68121
parent 562bfca4c80175d1d18eef5c3f4bb8dda53c03e4
author Linus Torvalds <torvalds@linux-foundation.org> 1435015380 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1435015380 -0700

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cleanups from Ingo Molnar:
 "Misc cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Clean up types in xlate_dev_mem_ptr() some more
  x86: Deinline dma_free_attrs()
  x86: Deinline dma_alloc_attrs()
  x86: Remove unused TI_cpu
  x86: Merge common 32-bit values in asm-offsets.c