]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebec402 4b9adb7)
Merge branch 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 22 Oct 2015 20:54:42 +0000 (13:54 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 22 Oct 2015 20:54:42 +0000 (13:54 -0700)
* '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

1  2 
drivers/net/bonding/bond_main.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/bonding/bond_main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.