Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky...
authorDavid S. Miller <davem@davemloft.net>
Sun, 25 Jul 2010 03:51:45 +0000 (20:51 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 25 Jul 2010 03:51:45 +0000 (20:51 -0700)

Trivial merge