Merge branch 'halasa-hdlc' of git://git.tuxdriver.com/git/netdev-jwl
authorJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 18:24:33 +0000 (13:24 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 18:24:33 +0000 (13:24 -0500)
commitf1b8c63ef404367c60dc9b4f68dec33cae3c707b
tree4547b64489274df9dd85af88bbbeddb77c6ec63a
parent972421264637b5df168125e157d881c1899519dd
parent1f7bad72c0ed8cf29d13bac81ceeba9e1ac05c66
Merge branch 'halasa-hdlc' of git://git.tuxdriver.com/git/netdev-jwl