summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-23 09:04:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-23 09:04:58 -0700
commit514b1923e1549162f1597f81113c0e5b72aed691 (patch)
treeb804bc621d81e022593584fc608df563c8c6b8ca /Makefile
parent6f73b3629f774c6cba589b15fd095112b25ca923 (diff)
parent5042ab91c4272e158748180ae70a2e097f9e90e3 (diff)
downloadlinux-514b1923e1549162f1597f81113c0e5b72aed691.tar.gz
linux-514b1923e1549162f1597f81113c0e5b72aed691.tar.xz
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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions