summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-03-22 08:27:36 +0300
committerPaul Mundt <lethal@linux-sh.org>2011-03-22 08:27:36 +0300
commitda49252fb0392d8196833ef3da92e48fb371f8d7 (patch)
tree1299899f7513a900b2229b8cde289bca8c41d2f5 /.mailmap
parenteddecbb601c9ea3fab7e67d7892010fc9426d1e6 (diff)
parentb295d6e593e02168fdafc5db11464b6d51cf239d (diff)
downloadlinux-da49252fb0392d8196833ef3da92e48fb371f8d7.tar.xz
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 '.mailmap')
0 files changed, 0 insertions, 0 deletions