git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 28c25cc a181509)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 2 Apr 2012 00:37:38 +0000 (10:37 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 2 Apr 2012 00:42:44 +0000 (10:42 +1000)
commit	e68218353418184ef29aa240dfc4fa3a73db8947
tree	b8160c254a63a71a1b79cd70cc1e951963abafe5	tree \| snapshot
parent	28c25cc2eec28c2f634a10a5c1087db632998054	commit \| diff
parent	a1815093d21c74ec2bda9dcaeb2ed8af1116df20	commit \| diff

Merge remote-tracking branch 'tile/master'

Conflicts:
arch/tile/include/asm/barrier.h
arch/tile/include/asm/pgtable.h

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/tile/include/asm/atomic_32.h	diff1 \|	diff2 \|	blob \| history
arch/tile/include/asm/bitops_64.h	diff1 \|	diff2 \|	blob \| history
arch/tile/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/tile/include/asm/setup.h	diff1 \|	diff2 \|	blob \| history
arch/tile/kernel/proc.c	diff1 \|	diff2 \|	blob \| history
arch/tile/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/tile/kernel/single_step.c	diff1 \|	diff2 \|	blob \| history
arch/tile/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/tile/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/tile/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/tile/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/tile/mm/pgtable.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/tile/tilepro.c	diff1 \|	diff2 \|	blob \| history
include/asm-generic/pgtable.h	diff1 \|	diff2 \|	blob \| history
include/linux/hugetlb.h	diff1 \|	diff2 \|	blob \| history
mm/hugetlb.c	diff1 \|	diff2 \|	blob \| history
mm/pgtable-generic.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules