]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 14 Jul 2008 22:49:04 +0000 (15:49 -0700)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 14 Jul 2008 22:51:11 +0000 (15:51 -0700)
commit751851af7aae9b8bd5a60b3897209081fbc18b2b
tree5cb8dbb71d691a760da61e319796800ee42cc1c5
parenta41eebab7537890409ea9dfe0fcda9b5fbdb090d
parentd71792ac3d48df6693f7b339e02494efc27036c3
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Conflicts:

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