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

Conflicts:
	arch/arm/mach-at91/Kconfig
This commit is contained in:
Russell King 2009-11-20 17:51:21 +00:00
commit ef1a68848a
3 changed files with 59 additions and 38 deletions