]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 8cf0b93 a0efa2f)
Merge wireless-next into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 Oct 2024 09:25:27 +0000 (11:25 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 Oct 2024 09:25:27 +0000 (11:25 +0200)
commitc2d2547783444a8c18d8c35a7ceffea85b02b0f6
treeb5981811da5a31d0f6a364a7b3c3f0bdec8958c2tree
parent8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7bcommit | diff
parenta0efa2f362a69e47b9d8b48f770ef3a0249a7911commit | diff
Merge wireless-next into staging-next

This merges up to commit a0efa2f362a6 ("Merge net-next/main to resolve
conflicts") from wireless-next into the staging-next branch to handle
the removal of a staging driver easier (it happened in the wireless-next
branch).  That way we don't have developers confused and start
submitting changes for this driver that is now deleted.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.