summaryrefslogtreecommitdiff
path: root/include/crypto/drbg.h
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-02-02 22:33:15 +0100
committerKalle Valo <kvalo@codeaurora.org>2017-02-08 17:23:39 +0200
commitd0630555650a394cf5743268820511f527a561a5 (patch)
tree7c7085e884f5a0a1b05eff319d4d266b5d80a8e2 /include/crypto/drbg.h
parent087fa712a00685dac4bcc64b7c3dc8ae6bee8026 (diff)
brcmfmac: merge two remaining brcmf_err macros
Now we always have __brcmf_err function we can do perfectly fine with just one macro. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'include/crypto/drbg.h')
0 files changed, 0 insertions, 0 deletions
diff)
Merge tag 'docs-4.10-rc1-fix' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet: "Two small fixes: - A merge error on my part broke the DocBook build. I've requisitioned one of tglx's frozen sharks for appropriate disciplinary action and resolved to be more careful about testing the DocBook stuff as long as it's still around. - Fix an error in unaligned-memory-access.txt" * tag 'docs-4.10-rc1-fix' of git://git.lwn.net/linux: Documentation/unaligned-memory-access.txt: fix incorrect comparison operator docs: Fix build failure
Diffstat (limited to 'include/trace/events/kvm.h')