diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 14:27:36 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 14:27:36 +0900 |
| commit | da49252fb0392d8196833ef3da92e48fb371f8d7 (patch) | |
| tree | 1299899f7513a900b2229b8cde289bca8c41d2f5 /drivers/video/au1100fb.h | |
| parent | eddecbb601c9ea3fab7e67d7892010fc9426d1e6 (diff) | |
| parent | b295d6e593e02168fdafc5db11464b6d51cf239d (diff) | |
Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux
Conflicts:
arch/arm/mach-omap2/board-overo.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/au1100fb.h')
0 files changed, 0 insertions, 0 deletions