summaryrefslogtreecommitdiff
path: root/fs/ocfs2/dlm/dlmmaster.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-08-10 20:47:59 (GMT)
committerArnd Bergmann <arnd@arndb.de>2016-08-11 06:43:03 (GMT)
commit12beb346710b766b8e74a7a3ac8165835bd68def (patch)
tree89bd4c660945349d9d68f371ec496ea97785b72a /fs/ocfs2/dlm/dlmmaster.c
parentf9db43bc296833451cbe4b03eb5e1f633ad1f787 (diff)
downloadlinux-12beb346710b766b8e74a7a3ac8165835bd68def.tar.xz
Merge tag 'pxa-fixes-v4.8' of https://github.com/rjarzmik/linux into randconfig-4.8
This is the pxa changes for v4.8 cycle. This is a tiny fix couple to enable changes in includes in gpio API without breaking pxa boards. * tag 'pxa-fixes-v4.8' of https://github.com/rjarzmik/linux: ARM: pxa: add module.h for corgi symbol_get/symbol_put usage ARM: pxa: add module.h for spitz symbol_get/symbol_put usage
Diffstat (limited to 'fs/ocfs2/dlm/dlmmaster.c')
0 files changed, 0 insertions, 0 deletions