review.tizen.org Git - profile/ivi/kernel-x86-ivi.git/commit

projects / profile / ivi / kernel-x86-ivi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4da669a 52e4c2a)

author	Jiri Kosina <jkosina@suse.cz>
	Sun, 13 Nov 2011 19:55:35 +0000 (20:55 +0100)
committer	Jiri Kosina <jkosina@suse.cz>
	Sun, 13 Nov 2011 19:55:53 +0000 (20:55 +0100)
commit	2290c0d06d82faee87b1ab2d9d4f7bf81ef64379
tree	e075e4d5534193f28e6059904f61e5ca03958d3c	tree \| snapshot
parent	4da669a2e3e5bc70b30a0465f3641528681b5f77	commit \| diff
parent	52e4c2a05256cb83cda12f3c2137ab1533344edb	commit \| diff

Merge branch 'master' into for-next

Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/40x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/44x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	diff1 \|	diff2 \|	blob \| history
crypto/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/namespace.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;