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

Trivial merge