Commits

Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable Conflicts: arch/arm/mach-at91/Kconfig
Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable Conflicts: arch/arm/mach-at91/Kconfig