From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Mon, 25 Aug 2014 13:35:26 +0000 (+0200)
Subject: Merge tag 'at91-drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: fixes-for-v3.18-merge-window~3^2~13^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e657ce689a85ff1c887b8020282e5b2ab1411ded;p=pandora-kernel.git

Merge tag 'at91-drivers-for-3.17' of git://git./linux/kernel/git/mripard/linux

Pull AT91 reset, poweroff and ram drivers from Maxime Ripard:
 "This tag holds the various new drivers introduced to move code that used to be
  in mach-at91 over to the proper frameworks.

  These files are the reboot and poweroff code for all AT91 SoCs but the RM9200,
  and the ram controller driver is not doing much at the time, except for grabing
  the RAM clock in order to leave it always enabled."

Conflicts:
	arch/arm/mach-at91/Kconfig
---

e657ce689a85ff1c887b8020282e5b2ab1411ded
Reading git-diff-tree failed