Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 18 Nov 2009 18:55:32 +0000 (10:55 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Nov 2009 18:55:32 +0000 (10:55 -0800)
commitdfef948ed2ba69cf041840b5e860d6b4e16fa0b1
treeeab385cabe589346bcf19385c997ab8dabaef7bd
parentea31ba359c55e0734ff895692185d4c50cf0c537
parentc85e9d7739fc8d879c4293ea020760926d6f87cd
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/ipw2x00/ipw2200.c