diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 14:37:21 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 14:37:21 +0100 |
| commit | dbf9387c08a68634b8d350b3585f91eae1ed59e1 (patch) | |
| tree | fd18f7645ccd6326cd90a310fa00c9ccaf5e4393 /fs/hostfs | |
| parent | 30c04fdd032d1962dbe71eee8ad38dc5053194d0 (diff) | |
| parent | 4f26b761531c00605010d595b495901106729f8b (diff) | |
Merge tag 'sunxi-defconfig-for-3.15' of https://github.com/mripard/linux into next/boards
Merge "Allwinner defconfig additions for 3.15" from Maxime Ripard:
Enables SPI and SID drivers in sunxi defconfig
* tag 'sunxi-defconfig-for-3.15' of https://github.com/mripard/linux:
ARM: sunxi: Enable A31 SPI and SID in the defconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/hostfs')
0 files changed, 0 insertions, 0 deletions