Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Tue, 29 Sep 2009 21:47:33 +0000 (07:47 +1000)
committerJames Morris <jmorris@namei.org>
Tue, 29 Sep 2009 21:47:33 +0000 (07:47 +1000)
1  2 
drivers/char/tpm/tpm.c

Simple merge