From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Jun 2014 21:51:25 +0000 (-0700)
Subject: Merge tag 'hsi-for-3.16-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~3746
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4a54e5e517cdc0044c9c9542e53736500a9391dc;p=firefly-linux-kernel-4.4.55.git

Merge tag 'hsi-for-3.16-fixes1' of git://git./linux/kernel/git/sre/linux-hsi

Pull HSI build fixes from Sebastian Reichel:
 - tighten dependency between ssi-protocol and omap-ssi to fix build
   failures with randconfig.
 - use normal module refcounting in omap driver to fix build with
   disabled module support

* tag 'hsi-for-3.16-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  hsi: omap_ssi_port: use normal module refcounting
  HSI: fix omap ssi driver dependency
---

4a54e5e517cdc0044c9c9542e53736500a9391dc