diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 14:12:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 14:12:04 -0700 |
| commit | fc2bb8d1cde1296d210a0f1ff9ee979a447d0a34 (patch) | |
| tree | 725696adebdc70e1b4e0ce8537da25eb5f2bf564 /drivers/ata/pata_amd.c | |
| parent | 475c77edf826333aa61625f49d6a2bec26ecb5a6 (diff) | |
| parent | bbceeee82ef55c11db0161f4078edd79290e3bcf (diff) | |
Merge branch 'i2c-embedded/for-3.4' of git://git.pengutronix.de/git/wsa/linux
Pull i2c embedded updates from Wolfram Sang:
"Nothing special from i2c-embedded for this merge window. Two new
drivers, minor feature additions, bugfixes, cleanups.
All patches have been in linux-next for some time, too."
* 'i2c-embedded/for-3.4' of git://git.pengutronix.de/git/wsa/linux:
i2c-eg20t: Remove write-only variables
i2c-eg20t: Rework pch_i2c_wait_for_bus_idle to reduce wait time
i2c-s3c2410: Add stub runtime power management
i2c-s3c2410: Convert to devm_kzalloc()
i2c: add CSR SiRFprimaII on-chip I2C controllers driver
i2c: tegra: Remove unnecessary write to INT_STATUS
i2c: imx: fix imx driver to work though signal is pending
i2c: designware: dw_i2c_init_driver as subsys initcall
misc: at24: describe platform_data with kernel_doc
i2c: Move I2C_EG20T option to the right place.
i2c: Support for Netlogic XLR/XLS I2C controller.
i2c: mpc: Add support for SMBUS_READ_BLOCK_DATA
i2c: versatile: Add Device Tree support
Diffstat (limited to 'drivers/ata/pata_amd.c')
0 files changed, 0 insertions, 0 deletions