summaryrefslogtreecommitdiff
path: root/include/crypto/blowfish.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/blowfish.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/blowfish.h')
0 files changed, 0 insertions, 0 deletions
a>)parent57b59ed2e5b91e958843609c7884794e29e6c4cb (diff)
Merge branch 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs updates from Chris Mason: "Some fixes that we've collected from the list. We still have one more pending to nail down a regression in lzo compression, but I wanted to get this batch out the door" * 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: remove ->{get, set}_acl() from btrfs_dir_ro_inode_operations Btrfs: disable xattr operations on subvolume directories Btrfs: remove old tree_root case in btrfs_read_locked_inode() Btrfs: fix truncate down when no_holes feature is enabled Btrfs: Fix deadlock between direct IO and fast fsync btrfs: fix false enospc error when truncating heavily reflinked file
Diffstat (limited to 'tools/perf/pmu-events/arch/x86/silvermont/pipeline.json')