diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 03:39:23 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 03:39:23 +0400 |
| commit | 4a7df24ddc7097cd789a7527187826552ea0765e (patch) | |
| tree | 2e70557e1d8e6d971ee6094de823900df1f8288e /fs/ocfs2/ioctl.c | |
| parent | 37d8cb5478651b27779b9a80d024c614c452eae3 (diff) | |
| parent | 5bdfdfeed5eed599a3ddc455f7c254a209ceae8d (diff) | |
| download | linux-4a7df24ddc7097cd789a7527187826552ea0765e.tar.xz | |
Merge branch 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linux
* 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linux: (21 commits)
mach-ux500: set proper I2C platform data from MOP500s
i2c-nomadik: break out single messsage transmission
i2c-nomadik: reset the hw after status check
i2c-nomadik: remove the unnecessary delay
i2c-nomadik: change the TX and RX threshold
i2c-nomadik: add code to retry on timeout failure
i2c-nomadik: use pm_runtime API
i2c-nomadik: print abort cause only on abort tag
i2c-nomadik: correct adapter timeout initialization
i2c-nomadik: remove the redundant error message
i2c-nomadik: corrrect returned error numbers
i2c-nomadik: fix speed enumerator
i2c-nomadik: make i2c timeout specific per i2c bus
i2c-nomadik: add regulator support
i2c: i2c-sh_mobile bus speed platform data V2
i2c: i2c-sh_mobile clock string removal
i2c-eg20t: Support new device ML7223 IOH
i2c: tegra: Add de-bounce cycles.
i2c: tegra: fix repeated start handling
i2c: tegra: recover from spurious interrupt storm
...
Diffstat (limited to 'fs/ocfs2/ioctl.c')
0 files changed, 0 insertions, 0 deletions