diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-26 06:14:47 (GMT) |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-26 06:14:47 (GMT) |
| commit | 9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd (patch) | |
| tree | 966b838e2190a7d6868cda5f4eee6d0f490da27c /Documentation/accounting/Makefile | |
| parent | e45f265e7ea3ee6de24efe91fe2928d603cb1741 (diff) | |
| parent | 138f296e140f79cb955caba70690076fb14e6f6d (diff) | |
| download | linux-fsl-qoriq-9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd.tar.xz | |
Merge branch '3.10/fb-mmap' into for-next
Merge topic branch to get vm_iomap_memory into use.
Conflicts:
drivers/video/fbmon.c
Diffstat (limited to 'Documentation/accounting/Makefile')
0 files changed, 0 insertions, 0 deletions