summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-16 16:25:35 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-11-16 16:25:35 +0900
commit27d29dc4be07aafae270992f8d6e400f8912a33d (patch)
tree2994c58243ec8267bb24ca7f5f2ca0c7852cac47 /drivers
parent936fc42831aa351974b707c00b9e67ac81cd530f (diff)
parent640dcfa0ff49ea1fcddad39e7c468683d9f00342 (diff)
parent4232f60791d12a5156c3e1c9b04ae08b873a2920 (diff)
Merge branches 'rmobile/fbdev' and 'common/fbdev-edid' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6