| commit | 4a54e5e517cdc0044c9c9542e53736500a9391dc | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 14 14:51:25 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 14 14:51:25 2014 -0700 |
| tree | cfe4c412fbaec60400cc4f9a211f6f179189126d | |
| parent | 1ad96bb0a20fa26b952b2250e89d14b6397bf618 [diff] | |
| parent | b357d7b58f379ebe8038cd97b6204f2f5c52220d [diff] |
Merge tag 'hsi-for-3.16-fixes1' of git://git.kernel.org/pub/scm/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