Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / um / sys-ia64 /
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2