projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4dd95b6 ead9d23)
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
tree00b793965beeef10db03e0ff021d2d965c410759tree | snapshot (tar.gz zip)
parent4dd95b63ae25c5cad6986829b5e8788e9faa0330commit | diff
parentead9d23d803ea3a73766c3cb27bf7563ac8d7266commit | diff
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 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
Motorola kernel-slsi