tree 4547b64489274df9dd85af88bbbeddb77c6ec63a
parent 972421264637b5df168125e157d881c1899519dd
parent 1f7bad72c0ed8cf29d13bac81ceeba9e1ac05c66
author Jeff Garzik <jgarzik@pobox.com> 1132338273 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1132338273 -0500

Merge branch 'halasa-hdlc' of git://git.tuxdriver.com/git/netdev-jwl