| commit | 7710601a8b24a3f77ebdfc7b213c21344c650987 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Mon Feb 16 16:57:48 2015 +0900 |
| committer | Mark Brown <broonie@kernel.org> | Mon Feb 16 16:57:48 2015 +0900 |
| tree | fbea2187b1d65430356fd4697f8db7433a28f272 | |
| parent | 13beb8851e931b3cfb3403c3a62bfee9ab27a60c [diff] | |
| parent | e60dc703729b117d0b617249bcae373a430ebade [diff] |
Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk Conflicts: arch/powerpc/kernel/prom.c drivers/of/Kconfig drivers/of/Makefile drivers/of/selftest.c include/linux/of.h