diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 15:28:36 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 15:28:36 +1000 |
| commit | 69ee7c898d3977e41fd0041d9b9e90aa04f355cc (patch) | |
| tree | 28999740247b569428c9db110b437d6be91b6c6e /arch/c6x/platforms/dscr.c | |
| parent | a7a1b34b158fe418a4b0f2c1e70638b5697cfb43 (diff) | |
| parent | 4e3a25b0274b8474f5ad46215a270785dd18265e (diff) | |
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
arch/arm/mach-shmobile/setup-r7s72100.c
drivers/base/platform.c
drivers/gpu/drm/armada/armada_crtc.c
lib/Kconfig.debug
Diffstat (limited to 'arch/c6x/platforms/dscr.c')
0 files changed, 0 insertions, 0 deletions