Merge branch 'fec' of git://git.pengutronix.de/git/ukl/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 22 Feb 2011 18:15:59 +0000 (10:15 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Feb 2011 18:15:59 +0000 (10:15 -0800)

Trivial merge