From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 14 Feb 2016 18:40:21 +0000 (-0800)
Subject: Merge branch 'component' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
X-Git-Tag: android-x86-7.1-r1~2086
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8b9f9ebe07f4ff1340f44e40aa7ce517d55e1882;p=android-x86%2Fkernel.git

Merge branch 'component' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Pull component helper fixes from Russell King:
 "A few fixes for problems people have encountered with the recent
  update to the component helpers"

* 'component' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  component: remove device from master match list on failed add
  component: Detach components when deleting master struct
  component: fix crash on x86_64 with hda audio drivers
---

8b9f9ebe07f4ff1340f44e40aa7ce517d55e1882