From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Aug 2013 16:36:38 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: firefly_0821_release~176^2~5578
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=64b4aaf0250c37e86aa12ecaab7e0108ecd88382;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull security layer fix from James Morris:
 "Smack casting fix"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  Smack: IPv6 casting error fix for 3.11
---

64b4aaf0250c37e86aa12ecaab7e0108ecd88382