summaryrefslogtreecommitdiffstats
path: root/security/keys
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-04-03 19:44:28 +0200
committerOlof Johansson <olof@lixom.net>2015-04-03 19:44:28 +0200
commitaabab880c5441cd39aef75fc1ecaa3125efb7a89 (patch)
treefa16a997164b3445bb3db233e229c56f9919ac49 /security/keys
parentMerge tag 'qcom-soc-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentARM: at91: remove useless include (diff)
downloadlinux-aabab880c5441cd39aef75fc1ecaa3125efb7a89.tar.xz
linux-aabab880c5441cd39aef75fc1ecaa3125efb7a89.zip
Merge tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/drivers
Merge "at91: cleanup for 4.1 #3" from Nicolas Ferre: Third batch of cleanup for 4.1: - System Timer (ST) for at91rm9200 re-work (syscon/regmap): - watchdog - restart handler - timer as a proper clocksource => remove mach dependency + cleanup * tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: (54 commits) ARM: at91: remove useless include clocksource: atmel-st: remove mach/hardware dependency clocksource: atmel-st: use syscon/regmap ARM: at91: time: move the system timer driver to drivers/clocksource ARM: at91: properly initialize timer ARM: at91: at91rm9200: remove deprecated arm_pm_restart watchdog: at91rm9200: implement restart handler watchdog: at91rm9200: use the system timer syscon mfd: syscon: Add atmel system timer registers definition ARM: at91/dt: declare atmel,at91rm9200-st as a syscon ARM: at91: remove old setup ARM: at91: sama5d4: remove useless map_io ARM: at91: sama5 use SoC detection infrastructure ARM: at91: at91sam9: use SoC detection infrastructure ARM: at91: at91rm9200 use SoC detection infrastructure ARM: at91: add soc detection infrastructure ARM: at91/dt: introduce atmel,<chip>-dbgu ARM: at91: remove unused _matrix.h headers ARM: at91: remove unused at91_ioremap_matrix and header ARM: at91: remove NEED_MACH_IO_H ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'security/keys')
0 files changed, 0 insertions, 0 deletions