summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 14:59:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 14:59:11 -0700
commit2b12a4c524812fb3f6ee590a02e65b95c8c32229 (patch)
tree6d319a371c56798d2d5c3ad21801eba142a1c77e /arch/arm/mach-ixp4xx
parent4744b43431e8613f920c5cba88346756f53c5165 (diff)
parent7f30491ccd28627742e37899453ae20e3da8e18f (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] Move include/asm-ia64 to arch/ia64/include/asm
Diffstat (limited to 'arch/arm/mach-ixp4xx')
0 files changed, 0 insertions, 0 deletions