History log of /openbmc/linux/sound/soc/codecs/ad73311.h (Results 51 – 75 of 95)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 2e8844e1 07-Apr-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into tracing/hw-branch-tracing

Merge reason: update to latest tracing and ptrace APIs

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# 5e344378 07-Apr-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/softlockup

Conflicts:
kernel/sysctl.c


# f541ae32 06-Apr-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into perfcounters/core-v2

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
arch/powerpc/kernel/Makefile
arch/x86/ia32/ia32entry.S
arch

Merge branch 'linus' into perfcounters/core-v2

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
arch/powerpc/kernel/Makefile
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/hardirq.h
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/irq.c
arch/x86/kernel/syscall_table_32.S
arch/x86/mm/iomap_32.c
include/linux/sched.h
kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

show more ...


# 9efe21cb 05-Apr-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into irq/threaded

Conflicts:
include/linux/irq.h
kernel/irq/handle.c


# 478c6a43 05-Apr-2009 Len Brown <len.brown@intel.com>

Merge branch 'linus' into release

Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: Len Brown <len.brown@intel.com>


# 83f2f0ed 02-Apr-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/urgent

Merge needed to go past commit 7ca43e756 (mm: use debug_kmap_atomic)
and fix it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# 7bee9463 31-Mar-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into locking-for-linus

Conflicts:
lib/Kconfig.debug


# 930861c4 30-Mar-2009 Felix Blyakher <felixb@sgi.com>

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


# 65fb0d23 30-Mar-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into cpumask-for-linus

Conflicts:
arch/x86/kernel/cpu/common.c


# 9ff9a26b 29-Mar-2009 Benjamin Herrenschmidt <benh@kernel.crashing.org>

Merge commit 'origin/master' into next

Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c


# 90f959bc 28-Mar-2009 Dave Airlie <airlied@redhat.com>

drm: merge Linux master into HEAD

Conflicts:
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_proc.c
drivers/gpu/drm/i915/i915_gem_debugfs.c


# 38a6ed3e 28-Mar-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/printk


# d00ab2fd 28-Mar-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/futexes


# b0d44c0d 28-Mar-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/iommu

Conflicts:
arch/x86/Kconfig


# 3fab1910 28-Mar-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/core


# ed40d0c4 28-Mar-2009 Russell King <rmk@dyn-67.arm.linux.org.uk>

Merge branch 'origin' into devel

Conflicts:
sound/soc/pxa/pxa2xx-i2s.c


# a8339857 27-Mar-2009 David S. Miller <davem@davemloft.net>

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/


# b92efa9a 27-Mar-2009 Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

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


# 08abe18a 26-Mar-2009 David S. Miller <davem@davemloft.net>

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
drivers/net/wimax/i2400m/usb-notif.c


# 1987f17d 26-Mar-2009 James Morris <jmorris@namei.org>

Merge branch 'master' into next


# 50201253 26-Mar-2009 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (430 commits)
ALSA: hda -

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (430 commits)
ALSA: hda - Add quirk for Acer Ferrari 5000
ALSA: hda - Use cached calls to get widget caps and pin caps
ALSA: hda - Don't create empty/single-item input source
ALSA: hda - Fix the wrong pin-cap check in patch_realtek.c
ALSA: hda - Cache pin-cap values
ALSA: hda - Avoid output amp manipulation to digital mic pins
ALSA: hda - Add function id to proc output
ALSA: pcm - Safer boundary checks
ALSA: hda - Detect digital-mic inputs on ALC663 / ALC272
ALSA: sound/ali5451: typo: s/resouces/resources/
ALSA: hda - Don't show the current connection for power widgets
ALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.c
ASoC: Declare Headset as Mic and Headphone widgets for SDP3430
ASoC: OMAP: N810: Add more jack functions
ASoC: OMAP: N810: Mark not connected input pins
ASoC: Add FLL support for WM8400
ALSA: hda - Don't reset stream at each prepare callback
ALSA: hda - Don't reset BDL unnecessarily
ALSA: pcm - Fix delta calculation at boundary overlap
ALSA: pcm - Reset invalid position even without debug option
...

show more ...


# b5c78489 23-Mar-2009 Takashi Iwai <tiwai@suse.de>

Merge branch 'topic/asoc' into for-linus


Revision tags: v2.6.29, v2.6.29-rc8
# 67a9c573 06-Mar-2009 Mike Frysinger <vapier.adi@gmail.com>

ASoC: Blackfin: fix typo in MUTE definition

Reported-by: Rob Maris <maris.rob@vdi.de>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by

ASoC: Blackfin: fix typo in MUTE definition

Reported-by: Rob Maris <maris.rob@vdi.de>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

show more ...


Revision tags: v2.6.29-rc7, v2.6.29-rc6, v2.6.29-rc5, v2.6.29-rc4, v2.6.29-rc3, v2.6.29-rc2, v2.6.29-rc1, v2.6.28
# 0ff55519 19-Dec-2008 Takashi Iwai <tiwai@suse.de>

Merge branch 'fix/hda' into topic/hda


Revision tags: v2.6.28-rc9, v2.6.28-rc8, v2.6.28-rc7
# 7fbb8759 26-Nov-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc6' into core/debug


1234