diff options
| author | Tom Rini <trini@konsulko.com> | 2022-07-21 09:16:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-07-21 09:16:59 -0400 |
| commit | 2996b6405e9522082b53ded0392438830ad6c43a (patch) | |
| tree | 4e506d1f8134ece5255b343214966f781fdf9ed6 /fs/btrfs/btrfs.c | |
| parent | 88d931a71052fc8fb7b48126ae09aa875745d5ec (diff) | |
| parent | ca85b5a146ebfd6da81f4b79e4b51eb9c5d6f60b (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- turris: Misc updates (Pali)
- mvebu: handle non-zero base address for RAM (Chris)
- mvebu: add support for Methode eDPU (Robert)
- mvebu: a3720: Set BOOT_TARGET_DEVICES list to enabled peripherals
(Pali)
- tlv_eeprom: Add missing CRC32 dependency (Pali)
- treewide: Fix Marek's name and change my e-mail address (Marek)
- mvebu: eDPU/uDPU: Misc updates (Robert)
- mvebu: Avoid reading MVEBU_REG_PCIE_DEVID register too many times
(Pali)
Diffstat (limited to 'fs/btrfs/btrfs.c')
| -rw-r--r-- | fs/btrfs/btrfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c index 741c6e20f53..4cdbbbe3d06 100644 --- a/fs/btrfs/btrfs.c +++ b/fs/btrfs/btrfs.c @@ -2,7 +2,7 @@ /* * BTRFS filesystem implementation for U-Boot * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #include <config.h> |