err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a41eeba d71792a)

author	David Woodhouse <David.Woodhouse@intel.com>
	Mon, 14 Jul 2008 22:49:04 +0000 (15:49 -0700)
committer	David Woodhouse <David.Woodhouse@intel.com>
	Mon, 14 Jul 2008 22:51:11 +0000 (15:51 -0700)
commit	751851af7aae9b8bd5a60b3897209081fbc18b2b
tree	5cb8dbb71d691a760da61e319796800ee42cc1c5	tree \| snapshot
parent	a41eebab7537890409ea9dfe0fcda9b5fbdb090d	commit \| diff
parent	d71792ac3d48df6693f7b339e02494efc27036c3	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Conflicts:

sound/pci/Kconfig

Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/microcode.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt61pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt73usb.c	diff1 \|	diff2 \|	blob \| history
include/asm-generic/vmlinux.lds.h	diff1 \|	diff2 \|	blob \| history
sound/isa/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/pci/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/pci/maestro3.c	diff1 \|	diff2 \|	blob \| history
sound/pci/pcxhr/pcxhr_core.c	diff1 \|	diff2 \|	blob \| history
sound/pci/ymfpci/ymfpci_main.c	diff1 \|	diff2 \|	blob \| history

Linux 2.6 source tree