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)
commit1669b049db50fc7f1d4e694fb115a0f408c63fce
tree9b3b90b5cbff9b8f30ecf0b2a44896ce8bef0c20
parent7f366784f5c2b8fc0658b5b374f4c63ee42c789f
parent17d857be649a21ca90008c6dc425d849fa83db5c
Merge branch 'master' into next
drivers/char/tpm/tpm.c