diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2014-03-16 13:13:51 +0100 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2014-03-16 13:13:51 +0100 |
| commit | 07b48c3ac539828d744f0562da1f24e8a234d06e (patch) | |
| tree | bb1d32d025f97fc47f44a037951563c72eaf586d /arch/sh/mm/cache-debugfs.c | |
| parent | afab4463acc5ae7aa975a0c2400b85ff541c6a5b (diff) | |
| parent | 0d639883ee26359e1bf38195df1dbca0f879e239 (diff) | |
Merge branch 'drm-minor' into drm-next
Fix minor conflicts with drm-anon:
- allocation/free order
- drm_device header cleanups
Diffstat (limited to 'arch/sh/mm/cache-debugfs.c')
0 files changed, 0 insertions, 0 deletions