Merge master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6] / drivers / char / tpm / tpm_atmel.h
2005-11-14  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-14  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-11-14  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-11-14  Kylene Jo Hall[PATCH] tpm: updates for new hardware