summaryrefslogtreecommitdiff
path: root/arch/arm/mach-cns3xxx
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-27 17:46:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-27 17:46:47 -0700
commit9dda696f0de87a2e5cfabb147e28c76b7d3c6846 (patch)
tree862a9fa39ce2d33156b815e1f7352038287579bf /arch/arm/mach-cns3xxx
parentc5617b200ac52e35f7e8cf05a17b0a2d50f6b3e9 (diff)
parent4ec37de89d8c758ee8115e0e64b3f994910789ee (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix build breakage
Diffstat (limited to 'arch/arm/mach-cns3xxx')
0 files changed, 0 insertions, 0 deletions