diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2017-10-05 15:42:39 +0300 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-10-05 15:42:39 +0300 |
commit | 26eafeaab917dd228d292f362be1577c9b4b2e77 (patch) | |
tree | bd89e0ed1c11635d184c7b497aac6ddd967ebde8 /include/uapi/rdma/bnxt_re-abi.h | |
parent | 4c3711d7fb4763c63b2654f2d07cbe21ca5aadd4 (diff) | |
parent | d81fa669e3de7eb8a631d7d95dac5fbcb2bf9d4e (diff) | |
download | linux-26eafeaab917dd228d292f362be1577c9b4b2e77.tar.xz |
Merge branch 'linus' into timers/core
Pick up upstream changes to get the prerequisites for the timer changes.
Diffstat (limited to 'include/uapi/rdma/bnxt_re-abi.h')
0 files changed, 0 insertions, 0 deletions