Merge branches 'upstream' and 'upstream-fixes' into for-linus
[linux-2.6] / include / linux / if_ppp.h
2005-11-09  Jeff GarzikMerge branch 'master'
2005-11-09  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-11-08  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-08  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-11-08  Matt Domsch[PPP]: add PPP MPPE encryption module
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2