projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30c04fd 4f26b76)
Merge tag 'sunxi-defconfig-for-3.15' of https://github.com/mripard/linux into next...
authorArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 13:37:21 +0000 (14:37 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 13:37:21 +0000 (14:37 +0100)
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>

Trivial merge
John Crispins staging tree