summaryrefslogtreecommitdiff
path: root/crypto/ccm.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-28 02:56:42 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-28 02:56:42 +0400
commit18d9946bc7e2252fe3c0f2f609ac383c627edefd (patch)
tree38e96bf2dc23d2dd379caa2dd9571cf6362f998c /crypto/ccm.c
parentc8bc5e39ac110acc88e41dd45d3f99956686f074 (diff)
parentfd117cd180fb11cf098c40e935d159d126fc4e6e (diff)
downloadlinux-18d9946bc7e2252fe3c0f2f609ac383c627edefd.tar.xz
Merge tag 'maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull "ARM: subarch maintainer updates" from Arnd Bergmann: "This is a collection of updates to the MAINTAINERS file, separated out mostly to give an overview of what has changed regarding who does what. Signed-off-by: Arnd Bergmann <arnd@arndb.de>" * tag 'maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: tegra: update main repo and add patchwork MAINTAINERS: update MAINTAINERS email entry MAINTAINERS: update maintainer entry for pxa/hx4700 MAINTAINERS: ARM: tegra: update Stephen's email address MAINTAINERS: add TI DaVinci git tree information MAINTAINERS: mark TI DaVinci list as "moderated" MAINTAINERS: remove arch/arm/mach-mx*/ from IMX entry
Diffstat (limited to 'crypto/ccm.c')
0 files changed, 0 insertions, 0 deletions