diff options
| author | Linus Torvalds | 2010-03-07 15:56:25 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2010-03-07 15:56:25 -0800 |
| commit | dd04265b028c00c365a78f9ff78a05e217f98656 (patch) | |
| tree | 4df2ce8ca3a2b8fcf5742718ecb90abe68666ffb /arch/x86/pci/Makefile | |
| parent | 6dc3eb5c1f96641cda7056aa34393e317076d6cf (diff) | |
| parent | 3f4ae8605261e6f71e721e026bc18cb1851a7276 (diff) | |
Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux:
i2c: Add support for Xilinx XPS IIC Bus Interface
i2c: omap: Add support for 16-bit registers
i2c-pnx: fix setting start/stop condition
powerpc: doc/dts-bindings: update doc of FSL I2C bindings
i2c-mpc: add support for the MPC512x processors from Freescale
i2c-mpc: rename "setclock" initialization functions to "setup"
i2c-mpc: use __devinit[data] for initialization functions and data
i2c/imx: don't add probe function to the driver struct
i2c: Add support for Ux500/Nomadik I2C controller
Diffstat (limited to 'arch/x86/pci/Makefile')
0 files changed, 0 insertions, 0 deletions