diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-09 18:03:55 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-09 18:03:55 +0000 |
| commit | 09d3f6f1613f287b1d3ea7d2c9caf5b7aff70c99 (patch) | |
| tree | 9f2923e577ca25a38eb7e0bb9cdb9d762c9b809e /drivers/gpu/drm/radeon/ni.c | |
| parent | bfa21a0dfe6915dc85953b5d40ea9dae5fdf205f (diff) | |
| parent | 39138818a4f5c62d70f35504477c2509f982f211 (diff) | |
| download | op-kernel-dev-09d3f6f1613f287b1d3ea7d2c9caf5b7aff70c99.zip op-kernel-dev-09d3f6f1613f287b1d3ea7d2c9caf5b7aff70c99.tar.gz | |
Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-dt-cb
Conflicts:
drivers/regulator/core.c
Diffstat (limited to 'drivers/gpu/drm/radeon/ni.c')
0 files changed, 0 insertions, 0 deletions
