Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
[linux-2.6] / drivers / net / tokenring / Makefile
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2