]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'robh/for-next' into devicetree/next
authorGrant Likely <grant.likely@linaro.org>
Sun, 29 Mar 2015 07:59:58 +0000 (08:59 +0100)
committerGrant Likely <grant.likely@linaro.org>
Sun, 29 Mar 2015 07:59:58 +0000 (08:59 +0100)
commit49a68976866de2d699b7d567be72242041e35ca1
treeb667828c308ffd79f1b2bd8fc1da95e43dfef4e3
parent5b702cfe8e753aa460c719a12f41566097d7442d
parent00b6080ebb9d5125dae5eb630e89b13029175fb3
Merge remote-tracking branch 'robh/for-next' into devicetree/next

Conflicts:
drivers/of/unittest.c
drivers/of/unittest.c