tree 27fa2b40b2fb4843043cc1583cd139844ee3f5fe
parent 089282fb028198169a0f62f8f833ab6d06bdbb3c
parent 9f2a0fac625bcef9c579bcf0b0c904ab1a56e7c4
author David S. Miller <davem@davemloft.net> 1288380195 -0700
committer David S. Miller <davem@davemloft.net> 1288380195 -0700

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6