Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky...
authorDavid S. Miller <davem@davemloft.net>
Fri, 11 Jun 2010 19:38:23 +0000 (12:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 11 Jun 2010 19:38:23 +0000 (12:38 -0700)

Trivial merge