Merge branch 'origin'
[linux-2.6] / arch / arm / mach-sa1100 / Makefile
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2