]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge tag 'sunxi-dt-for-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Sat, 23 Aug 2014 05:57:22 +0000 (22:57 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 23 Aug 2014 05:57:57 +0000 (22:57 -0700)
commit2136edf3bf5ee6dfda9ac7abe272a080c35dc811
tree47f7620d8b2ae8ea9914e1548029f21043fd73a1
parent95d516b9fca8ce77d6babd0c35513e7354441e7d
parent495bccf3917b04c6727d720b56620e265c693ace
Merge tag 'sunxi-dt-for-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes

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

Only a single patch in here that fixes a DTC warning.

* tag 'sunxi-dt-for-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: dt: sun6i: Add #address-cells and #size-cells to i2c controller nodes

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