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

Trivial merge