Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 11 Oct 2008 19:39:35 +0000 (12:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Oct 2008 19:39:35 +0000 (12:39 -0700)
commit56c5d900dbb8e042bfad035d18433476931d8f93
tree00b793965beeef10db03e0ff021d2d965c410759
parent4dd95b63ae25c5cad6986829b5e8788e9faa0330
parentead9d23d803ea3a73766c3cb27bf7563ac8d7266
Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Conflicts:

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