Merge branch 'tpmdd-04-17-13' of git://github.com/shpedoikal/linux into my-next

Browse source

...

This commit is contained in:

James Morris 2013-04-20 09:00:45 -07:00

parent df2c2afba4 32d33b29ba

commit b7ae9f064b

6 changed files with 207 additions and 87 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

Documentation/devicetree/bindings/i2c/trivial-devices.txt

View file

31

drivers/char/tpm/tpm.c

View file

3

drivers/char/tpm/tpm.h

View file

176

drivers/char/tpm/tpm_i2c_infineon.c

View file

64

drivers/char/tpm/tpm_i2c_stm_st33.c

View file

14

drivers/char/tpm/tpm_ppi.c

View file