diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-01-04 16:43:00 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-01-04 16:43:00 +0100 |
| commit | 1b9ec81258827001c869f003e0b8dd2ddc104717 (patch) | |
| tree | a3263a25d1e901531e3f16a7fcf0f24ef762ad97 /include/uapi/rdma/nes-abi.h | |
| parent | e9b2aefa88c5d9e4ea8fc950da9b105981ad60ec (diff) | |
| parent | d1df1e01af1d7c91e48204b9eb8b9f20cdb90700 (diff) | |
Merge tag 'davinci-fixes-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes
Pull "DaVinci fixes for v4.10" from Sekhar Nori:
This pull request contains fixes for the following issues
1) Fix two instances of infinite loop occurring in
clock list for DA850. This fixes kernel hangs in some
instances and so have been marked for stable kernel.
2) Fix for sleeping function called from atomic context
with USB 2.0 clock management code introduced in v4.10
merge window.
* tag 'davinci-fixes-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: da8xx: Fix sleeping function called from invalid context
ARM: davinci: Make __clk_{enable,disable} functions public
ARM: davinci: da850: don't add emac clock to lookup table twice
ARM: davinci: da850: fix infinite loop in clk_set_rate()
Diffstat (limited to 'include/uapi/rdma/nes-abi.h')
0 files changed, 0 insertions, 0 deletions