Merge branch 'master' into upstream (28eb177d) · Commits · Clea OS / bsp / nxp / linux-seco-imx · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-seco-imx
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Jira
- Terraform modules
- Model experiments

Snippets Groups Projects

28eb177d

Commit 28eb177d authored 18 years ago by Jeff Garzik

Downloads
- Plain Diff

Merge branch 'master' into upstream

Conflicts:

	net/ieee80211/ieee80211_crypt_tkip.c
	net/ieee80211/ieee80211_crypt_wep.c

parents fd8ae94e db392219

No related branches found

No related tags found

Loading

Changes 628

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/crypto/api-intro.txt 22 additions, 14 deletions

Documentation/crypto/api-intro.txt
MAINTAINERS 25 additions, 0 deletions

MAINTAINERS
arch/i386/crypto/Makefile 3 additions, 0 deletions

arch/i386/crypto/Makefile
arch/i386/crypto/aes.c 2 additions, 1 deletion

arch/i386/crypto/aes.c
arch/i386/crypto/twofish-i586-asm.S 335 additions, 0 deletions

arch/i386/crypto/twofish-i586-asm.S
arch/i386/crypto/twofish.c 97 additions, 0 deletions

arch/i386/crypto/twofish.c
arch/powerpc/Kconfig 13 additions, 1 deletion

arch/powerpc/Kconfig
arch/powerpc/Kconfig.debug 16 additions, 0 deletions

arch/powerpc/Kconfig.debug
arch/powerpc/boot/Makefile 6 additions, 1 deletion

arch/powerpc/boot/Makefile
arch/powerpc/boot/dts/mpc8349emds.dts 8 additions, 8 deletions

arch/powerpc/boot/dts/mpc8349emds.dts
arch/powerpc/boot/flatdevtree.h 46 additions, 0 deletions

arch/powerpc/boot/flatdevtree.h
arch/powerpc/boot/main.c 129 additions, 121 deletions

arch/powerpc/boot/main.c
arch/powerpc/boot/of.c 131 additions, 13 deletions

arch/powerpc/boot/of.c
arch/powerpc/boot/ops.h 100 additions, 0 deletions

arch/powerpc/boot/ops.h
arch/powerpc/boot/prom.h 0 additions, 41 deletions

arch/powerpc/boot/prom.h
arch/powerpc/boot/stdio.c 2 additions, 2 deletions

arch/powerpc/boot/stdio.c
arch/powerpc/boot/stdio.h 8 additions, 0 deletions

arch/powerpc/boot/stdio.h
arch/powerpc/boot/types.h 23 additions, 0 deletions

arch/powerpc/boot/types.h
arch/powerpc/configs/maple_defconfig 1 addition, 1 deletion

arch/powerpc/configs/maple_defconfig
arch/powerpc/kernel/Makefile 2 additions, 2 deletions

arch/powerpc/kernel/Makefile

with 969 additions and 205 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment