Merge ../linux-2.6 by hand
[linux-2.6] / include / keys / user-type.h
2005-10-31  Paul MackerrasMerge ../linux-2.6 by hand
2005-10-31  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-10-31  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-10-31  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-10-31  David Howells[PATCH] Keys: Export user-defined keyring operations