Merge branch 'ofed' of git://flatbed.openfabrics.org/~tnikolova/compat/ into ofed
authorVladimir Sokolovsky <vlad@mellanox.com>
Wed, 5 Nov 2014 12:07:45 +0000 (14:07 +0200)
committerVladimir Sokolovsky <vlad@mellanox.com>
Wed, 5 Nov 2014 12:07:45 +0000 (14:07 +0200)
commitf3c8a8c4cf4cc6cdf38f61c8083a2b01d1023993
treedc9820831abee457715d10a67fed3e03e733115a
parent8d9927005498e716e91ccf12cb5075362ed63b38
parenta6769b61bee4f4b3f8e0d819fdeda4be146ab848
Merge branch 'ofed' of git://flatbed.openfabrics.org/~tnikolova/compat/ into ofed

Conflicts:
include/linux/compat-3.12.h

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
include/linux/compat-3.12.h