Merge branch 'linus' into x86/xsave

Merge branch 'linus' into x86/memory-corruption-check

Merge branch 'linus' into x86/signal

Conflicts:
arch/x86/kernel/signal_64.c

Merge branch 'linus' into x86/quirks

Conflicts:
arch/x86/kernel/early-quirks.c

Merge branch 'linus' into x86/spinlocks

Done to prevent this failure of an Octopus merge:

Added arch/arm/include/asm/byteorder.h in both, but differently.
ERROR: Merge conflict in arch/arm/includ

Merge branch 'linus' into x86/spinlocks

Done to prevent this failure of an Octopus merge:

Added arch/arm/include/asm/byteorder.h in both, but differently.
ERROR: Merge conflict in arch/arm/include/asm/byteorder.h
Auto-merging include/asm-x86/spinlock.h
ERROR: Merge conflict in include/asm-x86/spinlock.h
fatal: merge program failed

show more ...

Merge branch 'linus' into x86/xen

Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c

Merge branch 'x86/urgent' into core/signal

Conflicts:
arch/x86/kernel/signal_64.c

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

Conflicts:

sound/core/memalloc.c

Merge branch 'for-linus' of git://git.alsa-project.org/alsa-kernel

* 'for-linus' of git://git.alsa-project.org/alsa-kernel: (258 commits)
ALSA: hda: VREF powerdown for headphones
ALSA: hda: STAC

Merge branch 'for-linus' of git://git.alsa-project.org/alsa-kernel

* 'for-linus' of git://git.alsa-project.org/alsa-kernel: (258 commits)
ALSA: hda: VREF powerdown for headphones
ALSA: hda: STAC_HP_M4
ALSA: ASoC: Check for machine type in GTA01 machine driver
ALSA: mtpav - Fix race in probe
ALSA: usb-audio: dynamic detection of MIDI interfaces in uaxx-quirk
ALSA: Add a note on dependency of RTC stuff
ALSA: ASoC: add new param mux to dapm_mux_update_power
ALSA: Increase components array size
ALSA: ASoC: Correct inverted Mic PGA Switch control in wm8510 driver
ALSA: hda: comment typo fix
ALSA: hda: comment typo fix
ALSA: hda - Fix PCI SSID for ASROCK K18N78FullHD-hSLI
ALSA: snd-usb-audio: support for Edirol UA-4FX device
ALSA: usb - Fix possible Oops at USB-MIDI disconnection
ALSA: hda - Fix another ALC889A (rev 0x100101)
ALSA: hda: add more board-specific information for Realtek ALC662 rev1
ALSA: Correct Vladimir Barinov's e-mail address
ALSA: cs46xx: Add PCI IDs for TerraTec and Hercules cards
ALSA: hda: SPDIF stream muting support
ALSA: hda: appletv support
...

show more ...

sound: ASoC: Convert wm8510 to a new-style i2c driver

Convert the wm8510 codec driver to the new (standard) device
driver binding model.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Geoffre

sound: ASoC: Convert wm8510 to a new-style i2c driver

Convert the wm8510 codec driver to the new (standard) device
driver binding model.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Geoffrey Wossum <gwossum@acm.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

show more ...

Merge branch 'linus' into timers/hpet

Merge branch 'x86/core' into x86/xsave

Merge branch 'master' of /home/cbou/linux-2.6

Conflicts:

drivers/power/Kconfig
drivers/power/Makefile

Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

Merge branch 'linus' into x86/pebs

Conflicts:

arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup_64.c

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

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

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

Merge branch 'linus' into x86/x2apic

Merge branch 'linus' into pci-for-jesse

Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

kernel/Makefile

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

Merge branch 'linus' into timers/nohz

Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks

Conflicts:

drivers/pci/quirks.c

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

Merge branch 'linus' into x86/amd-iommu

Merge branch 'linus' into x86/cleanups

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

Conflicts:

Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-m

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

Conflicts:

Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c

show more ...