summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dlmglue.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-18 12:07:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-18 12:07:48 -0700
commitc44b325568ae58bcb10d2f5c198ec471d9ab1bce (patch)
treec4a981d825c5b54cba1562fc7c59f253ff0b7a0f /fs/ocfs2/dlmglue.c
parent81429a6dbcbf3a01830de42dbdf0d9acbe68e1c1 (diff)
parent56d4b8a24cef5d66f0d10ac778a520d3c2c68a48 (diff)
downloadlinux-c44b325568ae58bcb10d2f5c198ec471d9ab1bce.tar.bz2
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: "Here are some bugfixes for the I2C subsystem. Kieran found a flaw in the recently renewed wake irq handling. Mika handled a user bug report where the ACPI info turned out to be unusable. I updated MAINTAINERS so that such bug reports will sooner get to the right people. Geert pointed me to a problem of some i2c drivers regarding PM which I fixed" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: designware: Do not use parameters from ACPI on Dell Inspiron 7348 MAINTAINERS: add maintainers for Synopsis Designware I2C drivers i2c: designware-platdrv: enable RuntimePM before registering to the core i2c: s3c2410: enable RuntimePM before registering to the core i2c: rcar: enable RuntimePM before registering to the core i2c: return probe deferred status on dev_pm_domain_attach
Diffstat (limited to 'fs/ocfs2/dlmglue.c')
0 files changed, 0 insertions, 0 deletions