tmp_suning_uos_patched/sound
Linus Torvalds 2e1ca21d46 Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
* master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild: (46 commits)
  kbuild: remove obsoleted scripts/reference_* files
  kbuild: fix make help & make *pkg
  kconfig: fix time ordering of writes to .kconfig.d and include/linux/autoconf.h
  Kconfig: remove the CONFIG_CC_ALIGN_* options
  kbuild: add -fverbose-asm to i386 Makefile
  kbuild: clean-up genksyms
  kbuild: Lindent genksyms.c
  kbuild: fix genksyms build error
  kbuild: in makefile.txt note that Makefile is preferred name for kbuild files
  kbuild: replace PHONY with FORCE
  kbuild: Fix bug in crc symbol generating of kernel and modules
  kbuild: change kbuild to not rely on incorrect GNU make behavior
  kbuild: when warning symbols exported twice now tell user this is the problem
  kbuild: fix make dir/file.xx when asm symlink is missing
  kbuild: in the section mismatch check try harder to find symbols
  kbuild: fix section mismatch check for unwind on IA64
  kbuild: kill false positives from section mismatch warnings for powerpc
  kbuild: kill trailing whitespace in modpost & friends
  kbuild: small update of allnoconfig description
  kbuild: make namespace.pl CROSS_COMPILE happy
  ...

Trivial conflict in arch/ppc/boot/Makefile manually fixed up
2006-03-25 08:48:48 -08:00
..
arm [ALSA] semaphore -> mutex (Archs, misc buses) 2006-03-22 10:25:43 +01:00
core [ALSA] Fix memory leaks in error path of control.c 2006-03-22 10:43:56 +01:00
drivers [ALSA] fix some memory leaks 2006-03-22 10:38:23 +01:00
i2c [ALSA] ice1712 & cs8427 - fix problem for S/PDIF input setup 2006-03-22 10:28:15 +01:00
isa [ALSA] Fix gus_pcm dereference before NULL 2006-03-22 10:39:25 +01:00
mips [ALSA] AMD Au1x00: AC'97 controller is memory mapped 2006-03-22 10:43:28 +01:00
oss Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild 2006-03-25 08:48:48 -08:00
parisc [ALSA] Remove xxx_t typedefs: PARISC Harmony 2006-01-03 12:20:09 +01:00
pci [PATCH] Intruduce DMA_28BIT_MASK 2006-03-22 10:53:19 +01:00
pcmcia [ALSA] Don't NULL check vfree argument in pdaudiocf_pcm.c 2006-03-22 10:31:45 +01:00
ppc [PATCH] s/;;/;/g 2006-03-24 07:33:24 -08:00
sparc BUG_ON() Conversion in sound/sparc/cs4231.c 2006-03-24 18:49:12 +01:00
synth [ALSA] semaphore -> mutex (driver part) 2006-03-22 10:24:57 +01:00
usb [ALSA] fix resource leak in usbmixer 2006-03-22 10:39:28 +01:00
Kconfig [ALSA] sound: align device drivers menus 2006-01-03 12:29:56 +01:00
last.c
Makefile
sound_core.c [PATCH] Driver Core: fix up all callers of class_device_create() 2005-10-28 09:52:52 -07:00
sound_firmware.c