review.tizen.org Git - platform/kernel/linux-amlogic.git/commit

projects / platform / kernel / linux-amlogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1ce53ad 9fe6206)

author	Michal Marek <mmarek@suse.cz>
	Wed, 4 Aug 2010 11:59:13 +0000 (13:59 +0200)
committer	Michal Marek <mmarek@suse.cz>
	Wed, 4 Aug 2010 11:59:13 +0000 (13:59 +0200)
commit	772320e84588dcbe1600ffb83e5f328f2209ac2a
tree	a7de21b79340aeaa17c58126f6b801b82c77b53a	tree \| snapshot
parent	1ce53adf13a54375d2a5c7cdbe341b2558389615	commit \| diff
parent	9fe6206f400646a2322096b56c59891d530e8d51	commit \| diff

Merge commit 'v2.6.35' into kbuild/kbuild

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
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
scripts/mod/file2alias.c	diff1 \|	diff2 \|	blob \| history
scripts/mod/modpost.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;