Merge branch 'for-james' of git://github.com/srajiv/tpm into next

author James Morris <[email protected]>

Wed, 16 Nov 2011 23:08:37 +0000 (10:08 +1100)

committer James Morris <[email protected]>

Wed, 16 Nov 2011 23:08:37 +0000 (10:08 +1100)
author James Morris <[email protected]>
Wed, 16 Nov 2011 23:08:37 +0000 (10:08 +1100)
committer James Morris <[email protected]>
Wed, 16 Nov 2011 23:08:37 +0000 (10:08 +1100)
diff --cc drivers/char/tpm/Kconfig
Simple merge
diff --cc drivers/char/tpm/tpm.c
Simple merge
author	James Morris <[email protected]>
	Wed, 16 Nov 2011 23:08:37 +0000 (10:08 +1100)
committer	James Morris <[email protected]>
	Wed, 16 Nov 2011 23:08:37 +0000 (10:08 +1100)
		1	2
drivers/char/tpm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/tpm/tpm.c	patch \|	diff1 \|	diff2 \|	blob \| history