git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Sat, 11 Oct 2008 19:39:35 +0000 (12:39 -0700)
committer	David S. Miller <davem@davemloft.net>
	Sat, 11 Oct 2008 19:39:35 +0000 (12:39 -0700)
commit	3fb6526c0a4231a2b4fb297d3f278ec1bdc8355e
tree	00b793965beeef10db03e0ff021d2d965c410759	tree \| snapshot
parent	d5ffd64b90b6264e186f6ea5c691c1015f01bfee	commit \| diff
parent	a152a4f434641233333e106c318d7628fa032ae7	commit \| diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

sound/core/memalloc.c

21 files changed:

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/sun4d_smp.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/sun4m_smp.c	diff1 \|	diff2 \|	blob \| history
arch/sparc64/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/sparc64/kernel/of_device.c	diff1 \|	diff2 \|	blob \| history
arch/sparc64/kernel/pci.c	diff1 \|	diff2 \|	blob \| history
arch/sparc64/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/leds/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/myri_sbus.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sunbmac.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qlogicpti.c	diff1 \|	diff2 \|	blob \| history
include/sound/core.h	diff1 \|	diff2 \|	blob \| history
include/sound/memalloc.h	diff1 \|	diff2 \|	blob \| history
sound/core/memalloc.c	diff1 \|	diff2 \|	blob \| history
sound/sparc/amd7930.c	diff1 \|	diff2 \|	blob \| history
sound/sparc/cs4231.c	diff1 \|	diff2 \|	blob \| history
sound/sparc/dbri.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/sun4d_smp.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/sun4m_smp.c	diff1 \|	diff2 \|	blob \| history
arch/sparc64/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/sparc64/kernel/of_device.c	diff1 \|	diff2 \|	blob \| history
arch/sparc64/kernel/pci.c	diff1 \|	diff2 \|	blob \| history
arch/sparc64/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/leds/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/myri_sbus.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sunbmac.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qlogicpti.c	diff1 \|	diff2 \|	blob \| history
include/sound/core.h	diff1 \|	diff2 \|	blob \| history
include/sound/memalloc.h	diff1 \|	diff2 \|	blob \| history
sound/core/memalloc.c	diff1 \|	diff2 \|	blob \| history
sound/sparc/amd7930.c	diff1 \|	diff2 \|	blob \| history
sound/sparc/cs4231.c	diff1 \|	diff2 \|	blob \| history
sound/sparc/dbri.c	diff1 \|	diff2 \|	blob \| history