Merge branch 'master'
[linux-2.6] / arch / m68k / atari / stram.c
2005-10-30  Jeff GarzikMerge branch 'master'
2005-10-30  Linus TorvaldsMerge /pub/scm/linux/kernel/git/herbert/crypto-2.6
2005-10-30  Hugh Dickins[PATCH] mm: m68k kill stram swap
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2