From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 5 Nov 2014 14:37:22 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: omap-for-v3.19/fixes-rc1~126^2~21^2~80
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19566b0bd93c34e4941822ed3c0d76a5abddcf82;p=pandora-kernel.git

Merge branch 'for-linus' into for-next

This merges the USB-audio disconnect fix and resolves the conflicts
so that we can continue working on development of usb-audio stuff.

Conflicts:
	sound/usb/card.c
---

19566b0bd93c34e4941822ed3c0d76a5abddcf82
Reading git-diff-tree failed