diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 17:45:35 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 17:45:35 +0200 |
commit | 06d215719653affcd3b75698dc63e8144804f06f (patch) | |
tree | 58bc47f45ecb7d27be9c0fb5e8a1f29c21c79d83 /fs/btrfs/dev-replace.c | |
parent | 6b0eb184939e015c4d9a38965c13f2a4bddb44ec (diff) | |
parent | 66e56302842e9971426bd7e504c4db4f88cbb037 (diff) |
Merge tag 'mvebu-defconfig64-4.12-1' of git://git.infradead.org/linux-mvebu into next/arm64
Pull "mvebu defconfig64 for 4.12 (part 1)" from Gregory CLEMENT:
Update arm64 defconfig by adding MVPP2 for Marvell Armada 7K/8K and
MVNETA and I2C_PXA for Armada 37xx.
* tag 'mvebu-defconfig64-4.12-1' of git://git.infradead.org/linux-mvebu:
arm64: defconfig: enable MVPP2
arm64: defconfig: enable I2C_PXA
arm64: defconfig: enable MVNETA
Diffstat (limited to 'fs/btrfs/dev-replace.c')
0 files changed, 0 insertions, 0 deletions