Merge branch 'mx51-baseport-sascha' of git://kernel.ubuntu.com/amitk/mx51-upstream...
authorSascha Hauer <s.hauer@pengutronix.de>
Wed, 10 Feb 2010 10:11:37 +0000 (11:11 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Wed, 10 Feb 2010 10:11:37 +0000 (11:11 +0100)

Trivial merge