Merge branch 'net/ax88796' of git://git.pengutronix.de/git/mkl/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 22 Feb 2011 19:15:29 +0000 (11:15 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Feb 2011 19:15:29 +0000 (11:15 -0800)

Trivial merge