]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5571415 c7de7de)
Merge branch 'r8152'
authorDavid S. Miller <davem@davemloft.net>
Wed, 15 Jan 2014 02:49:06 +0000 (18:49 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 15 Jan 2014 02:49:06 +0000 (18:49 -0800)
commit85a5bac9cd90966be75707e5b599bdd2cdcaa0e0
tree3f1a03819a3effb74641ba8cd50c00002f5635f8tree | snapshot
parent5571415c9685acc2c768b33d0be40b3f46869f14commit | diff
parentc7de7dec2ff2528ec630c55e68c25bd9d972b677commit | diff
Merge branch 'r8152'

Hayes Wang says:

====================
r8152: remove limitation

Remove the limitation between ecm mode and vendor mode.

v2: replace the patch #3 with "ecm and vendor modes coexist".
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Unnamed repository; edit this file 'description' to name the repository.