]> git.baikalelectronics.ru Git - kernel.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)
commit7ee4f540060aedd3891514ec466cdedddc576919
tree5cb8dbb71d691a760da61e319796800ee42cc1c5
parent3809fa14f3ea6d99fc2149f383ac80fceb6deeeb
parent0785d8dfd4be4cd510eaf702e0f1f32855baff54
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