Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2017-02-10 | Merge tag 'mac80211-next-for-davem-2017-02-09' of git://git.kernel.org/pub/sc... | David S. Miller | 1 | -41/+33 |
2017-02-08 | mac80211: fils_aead: Use crypto api CMAC shash rather than bare cipher | Ard Biesheuvel | 1 | -41/+33 | commit | 2c5d9555d6d937966d79d4c6529a5f7b9206e405 (patch) |
tree | 4f3d220ea3aeaadcae0796c5456e0ef9a908071d /fs/affs | |||
parent | 53cd1ad1a68fd10f677445e04ed63aa9ce39b36b (diff) | |||
parent | 2ad5d52d42810bed95100a3d912679d8864421ec (diff) |
Merge branch 'parisc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull two parisc fixes from Helge Deller:
"One fix to avoid usage of BITS_PER_LONG in user-space exported swab.h
header which breaks compiling qemu, and one trivial fix for printk
continuation in the parisc parport driver"
* 'parisc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Don't use BITS_PER_LONG in userspace-exported swab.h header
parisc, parport_gsc: Fixes for printk continuation lines
Diffstat (limited to 'fs/affs')