summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'locks-v3.20-1' of git://git.samba.org/jlayton/linuxLinus Torvalds2015-02-1013-405/+510
|\
| * locks: update comments that refer to inode->i_flockJeff Layton2015-01-212-10/+11
| * locks: consolidate NULL i_flctx checks in locks_remove_fileJeff Layton2015-01-161-2/+7
| * locks: keep a count of locks on the flctx listsJeff Layton2015-01-164-35/+38
| * locks: clean up the lm_change prototypeJeff Layton2015-01-163-11/+11
| * locks: add a dedicated spinlock to protect i_flctx listsJeff Layton2015-01-169-69/+71
| * locks: remove i_flock field from struct inodeJeff Layton2015-01-161-1/+2
| * locks: convert lease handling to file_lock_contextJeff Layton2015-01-162-155/+102
| * locks: convert posix locks to file_lock_contextJeff Layton2015-01-1611-198/+155
| * locks: move flock locks to file_lock_contextJeff Layton2015-01-166-35/+152
| * ceph: move spinlocking into ceph_encode_locks_to_buffer and ceph_count_locksJeff Layton2015-01-162-4/+4
| * locks: add a new struct file_locking_context pointer to struct inodeJeff Layton2015-01-163-1/+57
| * locks: have locks_release_file use flock_lock_file to release generic flock l...Jeff Layton2015-01-161-18/+31
| * locks: add new struct list_head to struct file_lockJeff Layton2015-01-162-3/+6
* | Merge tag 'pm+acpi-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2015-02-10299-1828/+5316
|\ \
| * \ Merge branch 'pm-tools'Rafael J. Wysocki2015-02-104-96/+314
| |\ \
| | * \ Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/len...Rafael J. Wysocki2015-02-103-95/+313
| | |\ \
| | | * | tools/power turbostat: relax dependency on APERF_MSRLen Brown2015-02-092-45/+68
| | | * | tools/power turbostat: relax dependency on invariant TSCLen Brown2015-02-091-39/+75
| | | * | tools/power turbostat: decode MSR_*_PERF_LIMIT_REASONSLen Brown2015-02-092-0/+130
| | | * | tools/power turbostat: relax dependency on root permissionLen Brown2015-02-091-12/+41
| | * | | Merge back earlier 'pm-tools' material for v3.20Rafael J. Wysocki2015-02-091-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | cpupower Makefile change to help run the tool without 'make install'sriram@marirs.net.in2015-01-301-1/+1
| * | | | Merge branch 'pm-cpufreq'Rafael J. Wysocki2015-02-1013-239/+386
| |\ \ \ \
| | * \ \ \ Merge branch 'sfi' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linu...Rafael J. Wysocki2015-02-095-2/+150
| | |\ \ \ \
| | | * | | | cpufreq: Add SFI based cpufreq driver supportSrinidhi Kasagar2014-12-204-0/+148
| | | * | | | SFI: fix compiler warningsAndy Shevchenko2014-12-031-2/+2
| | * | | | | intel_pstate: provide option to only use intel_pstate with HWPKristen Carlson Accardi2015-02-062-0/+9
| | * | | | | cpufreq-dt: Drop unnecessary check before cpufreq_cooling_unregister() invoca...Markus Elfring2015-02-031-2/+1
| | * | | | | cpufreq: Create for_each_governor()Viresh Kumar2015-02-031-3/+7
| | * | | | | cpufreq: Create for_each_policy()Viresh Kumar2015-02-031-5/+10
| | * | | | | cpufreq: Drop cpufreq_disabled() check from cpufreq_cpu_{get|put}()Viresh Kumar2015-02-031-4/+1
| | * | | | | cpufreq: Set cpufreq_cpu_data to NULL before putting kobjectViresh Kumar2015-02-031-3/+3
| | * | | | | intel_pstate: honor user space min_perf_pct override on resumeKristen Carlson Accardi2015-01-301-3/+11
| | * | | | | intel_pstate: respect cpufreq policy requestSrinivas Pandruvada2015-01-301-1/+2
| | * | | | | intel_pstate: Add num_pstates to sysfsKristen Carlson Accardi2015-01-302-0/+17
| | * | | | | intel_pstate: expose turbo range to sysfsKristen Carlson Accardi2015-01-302-0/+22
| | * | | | | intel_pstate: Add support for SkyLakeKristen Carlson Accardi2015-01-301-0/+1
| | * | | | | cpufreq: stats: drop unnecessary lockingViresh Kumar2015-01-231-5/+1
| | * | | | | cpufreq: stats: don't update stats on false notifiersViresh Kumar2015-01-231-2/+2
| | * | | | | cpufreq: stats: don't update stats from show_trans_table()Viresh Kumar2015-01-231-1/+0
| | * | | | | cpufreq: stats: time_in_state can't be NULL in cpufreq_stats_update()Viresh Kumar2015-01-231-3/+1
| | * | | | | cpufreq: stats: create sysfs group once we are readyViresh Kumar2015-01-231-19/+25
| | * | | | | cpufreq: remove CPUFREQ_UPDATE_POLICY_CPU notificationsViresh Kumar2015-01-232-6/+2
| | * | | | | cpufreq: stats: drop 'cpu' field of struct cpufreq_statsViresh Kumar2015-01-231-12/+0
| | * | | | | cpufreq: Remove (now) unused 'last_cpu' from struct cpufreq_policyViresh Kumar2015-01-232-5/+0
| | * | | | | cpufreq: stats: rename 'struct cpufreq_stats' objects as 'stats'Viresh Kumar2015-01-231-51/+51
| | * | | | | cpufreq: stats: get rid of per-cpu cpufreq_stats_tableViresh Kumar2015-01-232-33/+32
| | * | | | | cpufreq: stats: pass 'stat' to cpufreq_stats_update()Viresh Kumar2015-01-231-6/+4
| | * | | | | cpufreq: stats: don't check for freq table while freeing statsViresh Kumar2015-01-231-2/+1