Takashi Iwai cc1b76ed32 Merge branch 'for-linus' into for-next ...

Yet another non-trivial conflicts resolution for the recent HD-audio fix.

Conflicts:
	sound/pci/hda/hda_intel.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>

2015-06-12 08:10:20 +02:00

..

acpi

ACPICA: remove duplicate u8 typedef

2015-04-28 23:58:54 +02:00

asm-generic

…

clocksource

…

crypto

…

drm

ASoC: Updates for v4.2

2015-06-08 20:47:53 +02:00

dt-bindings

Merge remote-tracking branches 'asoc/topic/sta350', 'asoc/topic/tas2552', 'asoc/topic/tas3a227e' and 'asoc/topic/tas571x' into asoc-next

2015-06-05 18:55:03 +01:00

keys

…

kvm

…

linux

xfs: update for 4.1-rc6

2015-05-29 16:45:45 -07:00

math-emu

…

media

…

memory

…

misc

…

net

sctp: Fix mangled IPv4 addresses on a IPv6 listening socket

2015-05-27 14:15:26 -04:00

pcmcia

…

ras

…

rdma

IB/core: Fix unaligned accesses

2015-05-05 13:21:27 -04:00

rxrpc

…

scsi

SCSI: add 1024 max sectors black list flag

2015-04-27 09:38:06 -07:00

soc

…

sound

Merge branch 'for-linus' into for-next

2015-06-12 08:10:20 +02:00

target

target: Use a PASSTHROUGH flag instead of transport_types

2015-05-30 19:58:11 -07:00

trace

tracing/mm: don't trace mm_page_pcpu_drain on offline cpus

2015-05-28 18:25:18 -07:00

uapi

Merge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/twl6040', 'asoc/topic/wm5100', 'asoc/topic/wm8741' and 'asoc/topic/wm8960' into asoc-next

2015-06-05 18:55:05 +01:00

video

…

xen

xen/events: don't bind non-percpu VIRQs with percpu chip

2015-05-19 19:55:36 +01:00

Kbuild

…