Merge branch 'e1000-upstream' of git://198.78.49.142/linux-2.6
[powerpc.git] / arch / i386 / kernel / cpu / Makefile
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2