diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 23:07:19 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 23:07:19 +0100 |
| commit | b4beb4bf9934d151bf4581a54ae028927374cb2a (patch) | |
| tree | 28475f62b18784e1d10b05e901799d02c054587f /arch/arm/mach-u300/Kconfig | |
| parent | Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regulator (diff) | |
| parent | Merge branches 'for-32/i2c/nomadik', 'for-32/i2c/s3c2410-dt' and 'for-32/i2c/... (diff) | |
| download | linux-b4beb4bf9934d151bf4581a54ae028927374cb2a.tar.xz linux-b4beb4bf9934d151bf4581a54ae028927374cb2a.zip | |
Merge branch 'for-linus/i2c-3.2' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c-3.2' of git://git.fluff.org/bjdooks/linux: (47 commits)
i2c-s3c2410: Add device tree support
i2c-s3c2410: Keep a copy of platform data and use it
i2c-nomadik: cosmetic coding style corrections
i2c-au1550: dev_pm_ops conversion
i2c-au1550: increase timeout waiting for master done
i2c-au1550: remove unused ack_timeout
i2c-au1550: remove usage of volatile keyword
i2c-tegra: __iomem annotation fix
i2c-eg20t: Add initialize processing in case i2c-error occurs
i2c-eg20t: Fix flag setting issue
i2c-eg20t: add stop sequence in case wait-event timeout occurs
i2c-eg20t: Separate error processing
i2c-eg20t: Fix 10bit access issue
i2c-eg20t: Modify returned value s32 to long
i2c-eg20t: Fix bus-idle waiting issue
i2c-designware: Fix PCI core warning on suspend/resume
i2c-designware: Add runtime power management support
i2c-designware: Add support for Designware core behind PCI devices.
i2c-designware: Push all register reads/writes into the core code.
i2c-designware: Support multiple cores using same ISR
...
Diffstat (limited to 'arch/arm/mach-u300/Kconfig')
0 files changed, 0 insertions, 0 deletions