tree 5f2fbd338727f13669dcee5c41f9a936880b1ac0
parent a6b5825aa703714523a745a8e050b9d6105f6704
parent ebe5e12d00f4785092a9650845ad3451bbf4b311
parent 3fedd2ac7662a10ab2973d3b6f11cdce87b7171a
author Paul Mundt <lethal@linux-sh.org> 1306219797 +0900
committer Paul Mundt <lethal@linux-sh.org> 1306219797 +0900

Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6