projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c1ef4b e397a78)
Merge tag 'sunxi-defconfig-for-3.16-2' of https://github.com/mripard/linux into next...
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:07:01 +0000 (00:07 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:07:01 +0000 (00:07 +0200)
commitc6a7d1c6c2da4da8f4832cec78c59d142b828cf6
tree7cd451bc2c09442b6e714aa4a5d5c7f84d534c96tree | snapshot
parent6c1ef4b91714210216fb8d141d7379e5d972cd6dcommit | diff
parente397a78589e03ce920e0b4e5f8cc2cfa49027058commit | diff
Merge tag 'sunxi-defconfig-for-3.16-2' of https://github.com/mripard/linux into next/defconfig

Merge "Allwinner defconfig changes, take 2" from Maxime Ripard:

Add the A31 reset driver to the sunxi-related defconfigs

* tag 'sunxi-defconfig-for-3.16-2' of https://github.com/mripard/linux:
  ARM: multi_v7: Add Allwinner reset drivers to multi_v7_defconfig
  ARM: sunxi: Add A31 reset driver to sunxi_defconfig
  ARM: sunxi: drop CONFIG_COMMON_CLK_DEBUG

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Domain: System / Kernel;