diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-23 20:32:14 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-23 20:32:14 +0100 |
commit | df2a8f39cdecdf59be797b9c86b26f90b37321e7 (patch) | |
tree | a1e4aac4e005e0faf578c96f1cc618ecd55ee6cb /drivers/ata/libata-acpi.c | |
parent | Merge git://www.linux-watchdog.org/linux-watchdog (diff) | |
parent | MAINTAINERS: add maintainer entry for atmel i2c driver (diff) | |
download | linux-df2a8f39cdecdf59be797b9c86b26f90b37321e7.tar.xz linux-df2a8f39cdecdf59be797b9c86b26f90b37321e7.zip |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"One bugfix for the tegra driver. Two updates regarding email
addresses and MAINTAINERS which I like to have up-to-date so people
can be reached immediately. While we are here, there is on PCI_ID
addition."
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
MAINTAINERS: add maintainer entry for atmel i2c driver
i2c: Fix my e-mail address in drivers and documentation
i2c: iSMT: add Intel Avoton DeviceIDs
i2c: tegra: check the clk_prepare_enable() return value
Diffstat (limited to 'drivers/ata/libata-acpi.c')
0 files changed, 0 insertions, 0 deletions