summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-05-26 18:55:19 +0300
committerDoug Ledford <dledford@redhat.com>2016-05-26 18:55:19 +0300
commite6f61130ed7a124138c4f7b1bd35e24e8113cb83 (patch)
treeb7108ae9ae91d17c9850fc9d58b45120622196aa /include
parent0de4cbb3dddca35ecd06b95918f38439c9c6401f (diff)
parent492a7e67ff83fc59adb768de25ccaecd33d46beb (diff)
parentae43f8286730d1f2d241c34601df59f6d2286ac4 (diff)
downloadlinux-e6f61130ed7a124138c4f7b1bd35e24e8113cb83.tar.xz
Merge branches 'misc-4.7-2', 'ipoib' and 'ib-router' into k.o/for-4.7