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)
commitdb62983a1e4b2af9e79c97af768f0c8b80bd93f0
tree6cfac68841ea24503be3c0b935710774f722c46e
parent9e1453c5c5fe670bb98a6097b262122386b0d3fe
parentf6d7f2c60d3a63d786feeb60628f930cd2d8e912
Merge branch 'net/ax88796' of git://git.pengutronix.de/git/mkl/linux-2.6