diff options
author | Olof Johansson <olof@lixom.net> | 2014-08-22 22:57:22 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-08-22 22:57:57 -0700 |
commit | 2136edf3bf5ee6dfda9ac7abe272a080c35dc811 (patch) | |
tree | 47f7620d8b2ae8ea9914e1548029f21043fd73a1 /kernel/async.c | |
parent | 95d516b9fca8ce77d6babd0c35513e7354441e7d (diff) | |
parent | 495bccf3917b04c6727d720b56620e265c693ace (diff) | |
download | op-kernel-dev-2136edf3bf5ee6dfda9ac7abe272a080c35dc811.zip op-kernel-dev-2136edf3bf5ee6dfda9ac7abe272a080c35dc811.tar.gz |
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>
Diffstat (limited to 'kernel/async.c')
0 files changed, 0 insertions, 0 deletions