summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/pci-nanoengine.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-03-30 09:07:39 +0200
committerIngo Molnar <mingo@elte.hu>2011-03-30 09:07:43 +0200
commit9f644c4ba86b76159d36747fda7da496f72a1872 (patch)
tree31e025a5f283aff691fb636bf07fd0b445cf07a3 /arch/arm/mach-sa1100/pci-nanoengine.c
parent1b7155f7de119870f0d3fad89f125de2ff6c16be (diff)
parent0ce790e7d736cedc563e1fb4e998babf5a4dbc3d (diff)
downloadlinux-9f644c4ba86b76159d36747fda7da496f72a1872.tar.gz
linux-9f644c4ba86b76159d36747fda7da496f72a1872.tar.bz2
linux-9f644c4ba86b76159d36747fda7da496f72a1872.zip
Merge commit 'v2.6.39-rc1' into perf/urgent
Merge reason: use the post-merge-window tree. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-sa1100/pci-nanoengine.c')
0 files changed, 0 insertions, 0 deletions