aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/sh7760fb.c
diff options
context:
space:
mode:
authorMike Frysinger <vapier.adi@gmail.com>2008-10-08 05:39:02 -0400
committerBryan Wu <cooloney@kernel.org>2008-10-08 05:39:02 -0400
commit7eb2c23f602ab35c5f4227bc87945a3c78a14150 (patch)
tree6b425917db9e1e01d4f815a2aedf7c55e19b9915 /drivers/video/sh7760fb.c
parent5b04f271fe49bb7adb061de454d383c027a18de0 (diff)
Blackfin arch: fix merge errors during 2.6.26 upgrade
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'drivers/video/sh7760fb.c')
0 files changed, 0 insertions, 0 deletions