diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 06:27:36 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 06:27:36 +0100 |
| commit | da49252fb0392d8196833ef3da92e48fb371f8d7 (patch) | |
| tree | 1299899f7513a900b2229b8cde289bca8c41d2f5 /Makefile | |
| parent | Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek... (diff) | |
| parent | OMAP4: PandaBoard: Adding DVI support (diff) | |
| download | linux-da49252fb0392d8196833ef3da92e48fb371f8d7.tar.xz linux-da49252fb0392d8196833ef3da92e48fb371f8d7.zip | |
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 'Makefile')
0 files changed, 0 insertions, 0 deletions