From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Thu, 22 Oct 2015 20:54:42 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek into... 
X-Git-Tag: v4.1.12-92~253
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e6e9755a2e98abe920916e75392abbe35a61e45d;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek:
  bonding: fix merge issue introduced by 21844825.
  export host-only net/core and net/ipv4 parameters to a container as read-only
---

e6e9755a2e98abe920916e75392abbe35a61e45d