git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-mx27_3ds.c
diff --cc
arch/arm/mach-imx/mach-mx27_3ds.c
Simple merge