tree b804bc621d81e022593584fc608df563c8c6b8ca
parent 6f73b3629f774c6cba589b15fd095112b25ca923
parent 5042ab91c4272e158748180ae70a2e097f9e90e3
author Linus Torvalds <torvalds@linux-foundation.org> 1337789098 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1337789098 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel

Pull Hexagon architecture changes from Richard Kuo:
 "These are mostly cleanups and feedback remaining from the original
  upstreaming."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
  various Kconfig cleanup and old platform build code removal
  hexagon/mm/vm_fault.c: Port OOM changes to do_page_fault
  arch/hexagon/kernel/dma.c: make function static
  Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h
  Hexagon: Use resource_size function