aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211/aes_ccm.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-16 11:05:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-16 11:05:27 -0800
commit3962dfbe22a8d65e4162354cc859440293d85524 (patch)
tree18d9380ec463e29918328de0584232d74227cb66 /net/mac80211/aes_ccm.h
parent4302a8750d6f1c26eea16f4a202f9adcb2402014 (diff)
parent93de4ba86480a9e0d1062cb1d535fa97fb81af48 (diff)
downloadlinux-stericsson-3962dfbe22a8d65e4162354cc859440293d85524.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason: "We have a small collection of fixes in my for-linus branch. The big thing that stands out is a revert of a new ioctl. Users haven't shipped yet in btrfs-progs, and Dave Sterba found a better way to export the information" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: use right clone root offset for compressed extents btrfs: fix null pointer deference at btrfs_sysfs_add_one+0x105 Btrfs: unset DCACHE_DISCONNECTED when mounting default subvol Btrfs: fix max_inline mount option Btrfs: fix a lockdep warning when cleaning up aborted transaction Revert "btrfs: add ioctl to export size of global metadata reservation"
Diffstat (limited to 'net/mac80211/aes_ccm.h')
0 files changed, 0 insertions, 0 deletions