]> Gentwo Git Trees - linux/.git/commit
Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 Jan 2025 05:15:57 +0000 (16:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 Jan 2025 05:15:57 +0000 (16:15 +1100)
commit46f58ec7986404c0e9016507761d2eb47d85c3ec
treeec3e46bfc8858b1725a148059505f8c956cde866
parentadcf7a290c57987764546d1806800c4c16550511
parent970b9757cb44c315b5c3da6b1b35a1ffb07cca5a
Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git

# Conflicts:
# Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
Documentation/devicetree/bindings/trivial-devices.yaml
Documentation/userspace-api/ioctl/ioctl-number.rst
MAINTAINERS
drivers/android/binder.c
drivers/ptp/ptp_ocp.c
lib/Kconfig.debug
scripts/tags.sh