diff options
| author | Linus Torvalds | 2013-08-27 19:10:30 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2013-08-27 19:10:30 +0200 |
| commit | fa8218def1b1a16f0a410e2c1c767b4738cc81fa (patch) | |
| tree | c013ffb9ec56789d96e1d9db1f198275ba6e03bd /fs/ioprio.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | Merge remote-tracking branch 'regmap/fix/rbtree' into regmap-linus (diff) | |
| download | kernel-qcow2-linux-fa8218def1b1a16f0a410e2c1c767b4738cc81fa.tar.gz kernel-qcow2-linux-fa8218def1b1a16f0a410e2c1c767b4738cc81fa.tar.xz kernel-qcow2-linux-fa8218def1b1a16f0a410e2c1c767b4738cc81fa.zip | |
Merge tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap fixes from Mark Brown:
"Two changes here:
- Fix a bug in the rbtree code which could cause it to create two
different cache entries for the same register by adding a single
register at a time to the cache. This isn't awesome for
performance but it's non-invasive which we need for this late in
the release cycle and the I/O costs we're trying to avoid are high.
- Add another header used in the !CONFIG_REGMAP stubs where we had
been relying on implicit inclusion"
* tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: rbtree: Fix overlapping rbnodes.
regmap: Add another missing header for !CONFIG_REGMAP stubs
Diffstat (limited to 'fs/ioprio.c')
0 files changed, 0 insertions, 0 deletions