1
linux/sound/oss/dmasound
Linus Torvalds df6d3916f3 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits)
  [POWERPC] Abolish powerpc_flash_init()
  [POWERPC] Early serial debug support for PPC44x
  [POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
  [POWERPC] Add device tree for Ebony
  [POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
  [POWERPC] MPIC U3/U4 MSI backend
  [POWERPC] MPIC MSI allocator
  [POWERPC] Enable MSI mappings for MPIC
  [POWERPC] Tell Phyp we support MSI
  [POWERPC] RTAS MSI implementation
  [POWERPC] PowerPC MSI infrastructure
  [POWERPC] Rip out the existing powerpc msi stubs
  [POWERPC] Remove use of 4level-fixup.h for ppc32
  [POWERPC] Add powerpc PCI-E reset API implementation
  [POWERPC] Holly bootwrapper
  [POWERPC] Holly DTS
  [POWERPC] Holly defconfig
  [POWERPC] Add support for 750CL Holly board
  [POWERPC] Generalize tsi108 PCI setup
  [POWERPC] Generalize tsi108 PHY types
  ...

Fixed conflict in include/asm-powerpc/kdebug.h manually

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:50:19 -07:00
..
awacs_defs.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dac3550a.c [PATCH] OSS: replace kmalloc()+memset() combos with kzalloc() 2007-02-14 08:09:54 -08:00
dmasound_atari.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
dmasound_awacs.c [POWERPC] Rename device_is_compatible to of_device_is_compatible 2007-05-07 20:31:14 +10:00
dmasound_core.c [PATCH] const file_operations fallout 2007-03-14 15:27:48 -07:00
dmasound_paula.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
dmasound_q40.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
dmasound.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
Kconfig the scheduled removal of OBSOLETE_OSS options 2007-05-08 11:15:01 -07:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tas3001c_tables.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tas3001c.c [PATCH] OSS: replace kmalloc()+memset() combos with kzalloc() 2007-02-14 08:09:54 -08:00
tas3001c.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tas3004_tables.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tas3004.c [PATCH] OSS: replace kmalloc()+memset() combos with kzalloc() 2007-02-14 08:09:54 -08:00
tas3004.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tas_common.c [POWERPC] Remove old interface find_devices 2007-04-24 22:09:02 +10:00
tas_common.h [PATCH] powerpc: Fix sound driver use of i2c 2006-02-07 20:33:36 -08:00
tas_eq_prefs.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tas_ioctl.h i2c: Cleanup the includes of <linux/i2c.h> 2007-05-01 23:26:29 +02:00
trans_16.c [PATCH] m68k: compile fixes for dmasound (static vs. extern) 2006-01-12 09:09:02 -08:00