diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-03 15:14:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-03 15:14:54 -0700 |
| commit | 209c510e3666333ad58d3080ff3ba573474a6b05 (patch) | |
| tree | 0f06ffb6785cf902444484621558c52a50767998 /block/blk-merge.c | |
| parent | 53f9313f5c465b128febf763b58156e0acae136b (diff) | |
| parent | 91b370a0dbda5de92c2cf4c3bc0d18d6bf08f05f (diff) | |
Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux
Pull i2c embedded fixes from Wolfram Sang:
"Two patches are usual stuff.
The bigger patch is needed to correct a wrong decision made in this
merge window. We hoped to get the PIOQUEUE mode in the mxs driver
working with DMA, but it turned out to be too broken (leading to data
loss), so we now think it is best to remove it entirely and work only
with DMA now. The patch should be in 3.7. IMO, so users never get
the chance to use both modes in parallel."
* 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
i2c: tegra: set irq name as device name
i2c-nomadik: Fixup clock handling
i2c: mxs: remove broken PIOQUEUE support
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions