summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-2430sdp.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-05 19:09:03 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-05 19:09:03 +0100
commit58daf18cdcab550262a5f4681e1f1e073e21965a (patch)
tree2096324b947761a567dd451f33664f17ee1de2cd /arch/arm/mach-omap2/board-2430sdp.c
parentMerge branches 'mmci' and 'pl011-dma' into devel (diff)
parentARM: vexpress: add sched_clock() for Versatile Express (diff)
downloadlinux-58daf18cdcab550262a5f4681e1f1e073e21965a.tar.xz
linux-58daf18cdcab550262a5f4681e1f1e073e21965a.zip
Merge branch 'clksrc' into devel
Conflicts: arch/arm/mach-vexpress/v2m.c arch/arm/plat-omap/counter_32k.c arch/arm/plat-versatile/Makefile
Diffstat (limited to 'arch/arm/mach-omap2/board-2430sdp.c')
0 files changed, 0 insertions, 0 deletions