git.kernel.dk Git - linux-block.git/commit

projects / linux-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 69575d3 326ba50)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 2 Sep 2009 06:17:56 +0000 (08:17 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 2 Sep 2009 06:17:56 +0000 (08:17 +0200)
commit	936e894a976dd3b0f07f1f6f43c17b77b7e6146d
tree	5ed5c1f6735dcd26550594df23c8f7fe2aa21a15	tree \| snapshot
parent	69575d388603365f2afbf4166df93152df59b165	commit \| diff
parent	326ba5010a5429a5a528b268b36a5900d4ab0eba	commit \| diff

Merge commit 'v2.6.31-rc8' into x86/txt

Conflicts:
arch/x86/kernel/reboot.c
security/Kconfig

Merge reason: resolve the conflicts, bump up from rc3 to rc8.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/reboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/intel-iommu.c	diff1 \|	diff2 \|	blob \| history
security/Kconfig	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)