diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-02-22 16:44:25 -0600 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-02-22 16:44:25 -0600 |
| commit | 59907e088f4deec7ef2d651d884a4608e8db110e (patch) | |
| tree | e652c235cb4c2cffc9885c92253e437205f18cc3 /lib/bitmap.c | |
| parent | 5afd1c5179a4f9e6e54527d2d52c250e30dc398d (diff) | |
| parent | 394f9168b509198235fe0cd019b3c1470cdd3648 (diff) | |
Merge tag 'L24.4-p1' of git://dev.omapzoom.org/pub/scm/axelcx/kernel-display into richo
Conflicts:
drivers/media/video/omap/omap_vout.c
Diffstat (limited to 'lib/bitmap.c')
0 files changed, 0 insertions, 0 deletions