Merge branch 'master' into 83xx
[linux-2.6] / include / linux / if_wanpipe.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2