summary refs log tree commit diff
path: root/block/blk-cgroup.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-06-09 11:14:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-09 11:14:30 -0700
commit1329c20433fb1298dd0bf94b59c1a11f27a1f2e2 (patch)
tree5aae67e8fe5170f88323d6d8304f625bd883b05b /block/blk-cgroup.c
parentd6c7528447dec208f9b742ede047753584528c0a (diff)
parent1c1ff29da6c86864e73b05d4301a2df1d161f2da (diff)
downloadlinux-1329c20433fb1298dd0bf94b59c1a11f27a1f2e2.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:

 - a FPE signal fix that was also merged upstream

 - privileged ADI driver from Tom Hromatka

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: fix compat siginfo ABI regression
  selftests: sparc64: char: Selftest for privileged ADI driver
  char: sparc64: Add privileged ADI driver
Diffstat (limited to 'block/blk-cgroup.c')
0 files changed, 0 insertions, 0 deletions