diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-10 00:49:54 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-10 00:49:54 (GMT) |
| commit | b86c95253af2105c9824146c6569a6b0f39ab124 (patch) | |
| tree | 9100acbdc843b1081b154135000b89ee95cd10d3 /crypto/crypto_user.c | |
| parent | e5feac72dad5475167445de9af564c2d592872bb (diff) | |
| parent | 07c8b57b111585a617b2b456497fc9b33c00743c (diff) | |
| download | linux-fsl-qoriq-b86c95253af2105c9824146c6569a6b0f39ab124.tar.xz | |
Merge branch 'rtmerge' into sdk-v1.6.x
This merges 3.12.15-rt25.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Conflicts:
drivers/misc/Makefile
drivers/net/ethernet/freescale/gianfar.c
drivers/net/ethernet/freescale/gianfar_ethtool.c
drivers/net/ethernet/freescale/gianfar_sysfs.c
Diffstat (limited to 'crypto/crypto_user.c')
0 files changed, 0 insertions, 0 deletions