From: Russell King Date: Fri, 20 Nov 2009 17:51:21 +0000 (+0000) Subject: Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ef1a68848a968f7347cf7eea24072464059af8f1;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable Conflicts: arch/arm/mach-at91/Kconfig --- ef1a68848a968f7347cf7eea24072464059af8f1