Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorStephen Hemminger <shemminger@osdl.org>
Mon, 8 May 2006 23:01:20 +0000 (16:01 -0700)
committerStephen Hemminger <shemminger@osdl.org>
Mon, 8 May 2006 23:01:20 +0000 (16:01 -0700)
commit23aee82e75c1ced9492cbff6090b8e213d95945e
tree2d8f0f7fc59a65bffc852c7dc167ee6b196c07a7
parent8ec93459655a3618dedec6360bb28d63f0010ef6
parent178e0cc5ff249965c6cfbd78b1af6a5e614d837c
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6