Merge remote-tracking branch 'armsoc/at91/device-board' into at91-3.4-base2
authorNicolas Ferre <nicolas.ferre@atmel.com>
Sat, 11 Feb 2012 13:32:50 +0000 (14:32 +0100)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Sat, 11 Feb 2012 13:32:50 +0000 (14:32 +0100)

Trivial merge