Skip to content
GitLab
Explore
Sign in
Register
xcap
xcap-capability-linux
Repository
xcap-capability-linux
arch
arm
mach-omap2
board-omap3evm.c
Find file
Blame
History
Permalink
Merge branch 'for-tony' of
git://gitorious.org/linux-omap-dss2/linux
into omap-for-linus
· 7cab8713
Tony Lindgren
authored
Feb 23, 2011
Conflicts: arch/arm/mach-omap2/board-3430sdp.c
7cab8713