summaryrefslogtreecommitdiff
path: root/drivers/char/tpm/tpm_atmel.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-01 07:40:37 +0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-01 07:40:37 +0400
commit6db602d447fb6c3aeb020c5dff5219de317f8bb4 (patch)
tree379cfdff0c1f6eb66edfbc6a50dfde281602ca13 /drivers/char/tpm/tpm_atmel.c
parente89a5a43b95cdc4305b7c8e8121a380f02476636 (diff)
parent5ff70cac3e98af64f9a1eaec9e762ff4927c26d1 (diff)
downloadlinux-6db602d447fb6c3aeb020c5dff5219de317f8bb4.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/ehca: SRQ fixes to enable IPoIB CM IB/ehca: Fix Small QP regressions
Diffstat (limited to 'drivers/char/tpm/tpm_atmel.c')
0 files changed, 0 insertions, 0 deletions