Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
authorDavid S. Miller <davem@davemloft.net>
Mon, 19 May 2008 23:29:40 +0000 (16:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 19 May 2008 23:29:40 +0000 (16:29 -0700)

Trivial merge