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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1d21f41 c9575dc)

author	Michal Marek <mmarek@suse.cz>
	Tue, 3 Aug 2010 12:24:38 +0000 (14:24 +0200)
committer	Michal Marek <mmarek@suse.cz>
	Tue, 3 Aug 2010 12:24:38 +0000 (14:24 +0200)
commit	1a7ba9260555b9e166702ca81c0f593b1c53b4b2
tree	1d6087485a9b4f601f8ced8b449ea2134625f1d8	tree \| snapshot
parent	1d21f418a8af887f77bf08135c434bee5098dd63	commit \| diff
parent	c9575dc680dffa26411e9aed32b4a1e12609428d	commit \| diff

Merge branch 'kbuild/kbuild' into kbuild/for-next

Conflicts:
arch/powerpc/Makefile

Makefile	diff1 \|	diff2 \|	blob \| history
arch/blackfin/Makefile	diff1 \|	diff2 \|	blob \| history
arch/ia64/Makefile	diff1 \|	diff2 \|	blob \| history
arch/mips/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Makefile	diff1 \|	diff2 \|	blob \| history
arch/s390/Makefile	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules