Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 6 Aug 2010 20:30:43 +0000 (13:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 6 Aug 2010 20:30:43 +0000 (13:30 -0700)
commite225567960db50e9810a152c8621c7a6ed94de71
treed0129e2988f8aea56d4f00f04c4818c2e8cc07a2
parent4b030d4288a569d6bdeca884d7f102d951f097f2
parenta24d52f390a77ce90dc8cf0cd75d27ec0a6ea3f8
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
MAINTAINERS
drivers/net/wireless/ipw2x00/ipw2100.c