summaryrefslogtreecommitdiff
path: root/include/dt-bindings/clock/r8a7795-cpg-mssr.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/dt-bindings/clock/r8a7795-cpg-mssr.h')
0 files changed, 0 insertions, 0 deletions
377fa1ac9e362ed4b&id2=c74454fadd5ea6fc866ffe2c417a0dba56b2bf1c'>net/netfilter/nf_conntrack_core.c29
2 files changed, 26 insertions, 5 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h324db158c3cc28209a15b1'>diff)
parentbbb27fc33d44e7b8d96369810654df4ee1837566 (diff)
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c bugfixes from Wolfram Sang: "Two bugfixes (proper IO mapping and use of mutex) for a driver feature we introduced in this cycle" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: piix4: Request the SMBUS semaphore inside the mutex i2c: piix4: Fix request_region size
Diffstat (limited to 'drivers/usb/core/usb.c')