Merge tag 'sunxi-defconfig-for-3.16' of https://github.com/mripard/linux into next...
authorOlof Johansson <olof@lixom.net>
Wed, 21 May 2014 21:42:01 +0000 (14:42 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 21 May 2014 21:42:01 +0000 (14:42 -0700)
Merge "Allwinner defconfig additions for 3.16" from Maxime Ripard.

* tag 'sunxi-defconfig-for-3.16' of https://github.com/mripard/linux:
  ARM: sunxi: drop CONFIG_COMMON_CLK_DEBUG

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge