git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b0356cd 9df2fe9)

author	Ingo Molnar <mingo@elte.hu>
	Sun, 13 Jul 2008 20:52:27 +0000 (22:52 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Sun, 13 Jul 2008 20:52:27 +0000 (22:52 +0200)
commit	dbbcfb2211761fa69e831a78119c9288fb87eb9d
tree	b40b103ed250e287bf3d4790f1c87001cf7cf52f	tree
parent	b0356cd0e7497252a2c45ecb07b79d931390c8b2	commit \| diff
parent	9df2fe986770bc4c76e8fe72c20b71268eec39a7	commit \| diff

Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks

Conflicts:

arch/x86/mm/ioremap.c

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/ioremap.c	diff1 \|	diff2 \|	blob \| history
arch/x86/pci/common.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/desc.h	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.