Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
authorDavid S. Miller <davem@davemloft.net>
Sun, 16 May 2010 06:14:16 +0000 (23:14 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 16 May 2010 06:14:16 +0000 (23:14 -0700)

Trivial merge