Merge branch 'upstream'
[linux-2.6] / include / linux / memory.h
2005-10-30  Jeff GarzikMerge branch 'upstream'
2005-10-30  Jeff GarzikMerge branch 'master'
2005-10-30  Linus TorvaldsMerge /pub/scm/linux/kernel/git/herbert/crypto-2.6
2005-10-30  Dave Hansen[PATCH] memory hotplug: sysfs and add/remove functions