merge with: https://github.com/linux4sam/linux-at91/tree/linux-3.10-at91

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>