path: root/fs/ocfs2/acl.h
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-12 11:23:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-12 11:23:08 -0700
commit422ce5a97570cb8a37d016b6bc2021ae4dac5499 (patch)
treebda1f2df0c2f3226fd0c984b0edf05117634da1c /fs/ocfs2/acl.h
parent685764b108a7e5fe9f5ee213d6a627c1166d7c88 (diff)
parent5305a7b7e860bb40ab226bc7d58019416073948a (diff)
Merge tag 'pinctrl-v4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pinctrl fix from Linus Walleij: "A single last pin control fix for v4.6. t's tagged for stable and only hits a single driver with two added lines so should be safe. Tested in linux-next. - The pull up/down logic for the AT91 PIO4 controller was tilted: we need to mask the reverse pull when unmasking a pull direction. Setting both pull up & pull down is illegal and makes no sense" * tag 'pinctrl-v4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: pinctrl: at91-pio4: fix pull-up/down logic
Diffstat (limited to 'fs/ocfs2/acl.h')
0 files changed, 0 insertions, 0 deletions