aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-03-22 14:27:36 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-03-22 14:27:36 +0900
commitda49252fb0392d8196833ef3da92e48fb371f8d7 (patch)
tree1299899f7513a900b2229b8cde289bca8c41d2f5 /.mailmap
parentMerge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 (diff)
parentOMAP4: PandaBoard: Adding DVI support (diff)
downloadlinux-dev-da49252fb0392d8196833ef3da92e48fb371f8d7.tar.xz
linux-dev-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 '')
0 files changed, 0 insertions, 0 deletions