Merge tag 'aspeed-for-4.7-defconfig' of https://github.com/shenki/linux into next...
authorArnd Bergmann <arnd@arndb.de>
Tue, 10 May 2016 12:25:54 +0000 (14:25 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 10 May 2016 12:25:54 +0000 (14:25 +0200)
commit2cbb21d749efb9ca1eef04f04d189d4961b33b79
tree9247e91a955e09c9e396d96592a9f7f0c8f03ca2
parent11d708f414a78b8e2903cbcff34bec69c73ba1b5
parentd0bc3483da8774dcea1e0692586830031783f08c
Merge tag 'aspeed-for-4.7-defconfig' of https://github.com/shenki/linux into next/defconfig

Merge "aspeed defconfig for 4.7" from Joel Stanley:

This adds configurations used for testing Aspeed BMC SoCs, as well as adding
the v5 part to the multi defconfig.

* tag 'aspeed-for-4.7-defconfig' of https://github.com/shenki/linux:
  arm/configs: Add Aspeed defconfig
  arm/configs/multi_v5: Add Aspeed ast2400
arch/arm/configs/multi_v5_defconfig