Merge branch 'upstream'
[linux-2.6] / include / asm-arm / arch-cl7500 / memory.h
2005-10-30  Jeff GarzikMerge branch 'upstream'
2005-10-29  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-10-29  Nicolas Pitre[ARM] 3060/1: allow constants found in asm/memory.h...
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2