git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cb83f5b 45fbe79)

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	a18176f977a4e8a2a1a2cb11ada813871a10e018
tree	e075e4d5534193f28e6059904f61e5ca03958d3c	tree \| snapshot
parent	cb83f5bb2c69cb1677d7ff2d87e0c8e4225317fb	commit \| diff
parent	45fbe79177f054b69b11f33a6cb3f5f849b7ddf4	commit \| diff

Merge branch 'master' into for-next

Sync with Linus tree to have a6bfd452 ("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

Linux Kernel Source Tree.