Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 9 Apr 2008 22:10:14 +0000 (15:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Apr 2008 22:10:14 +0000 (15:10 -0700)
commitb41f5bfff73f244101b34f3603974ef7aeadf545
tree5c7fc7de15a020cde0f99fac3e61d981a1d59022
parentbcf0dda8d2408fe1c1040cdec5a98e5fcad2ac72
parente91e9d490d9ae382003ef9d05fd50238db54c35b
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
drivers/net/wireless/ipw2200.c