diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-24 14:35:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-24 14:35:21 -0400 |
| commit | ddc9b34c3b3bc063a7d9eb891ae09b8f49cfb27e (patch) | |
| tree | e28d67d3872dce2516c039ccad08fabff076cead /fs/ext4/inode.c | |
| parent | 8e500ff8df1223dfb42d6c39d3de1fc216fba1a2 (diff) | |
| parent | fd187aaf980c45f1d16a94a846faa68e24de03c8 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] use max load in conservative governor
[CPUFREQ] fix a lockdep warning
Diffstat (limited to 'fs/ext4/inode.c')
0 files changed, 0 insertions, 0 deletions