diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-07-01 05:16:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-07-01 05:18:53 -0400 |
| commit | 2fd1b487884310d0aa0c0640179dc7490ad86313 (patch) | |
| tree | 1083dce15bd7dc0858c3883b8a361242046c5e09 /drivers/ata/ahci.h | |
| parent | 333bb864f192015a53b5060b829089decd0220ef (diff) | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
Merge tag 'v3.10' into sched/core
Merge in a recent upstream commit:
c2853c8df57f include/linux/math64.h: add div64_ul()
because:
72a4cf20cb71 sched: Change cfs_rq load avg to unsigned long
relies on it.
[ We don't rebase sched/core for this, because the handful of
followup commits after the broken commit are not behavioral
changes so are unlikely to be needed during bisection. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/ata/ahci.h')
| -rw-r--r-- | drivers/ata/ahci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index b830e6c9fe49..10b14d45cfd2 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * ahci.h - Common AHCI SATA definitions and declarations | 2 | * ahci.h - Common AHCI SATA definitions and declarations |
| 3 | * | 3 | * |
| 4 | * Maintained by: Jeff Garzik <jgarzik@pobox.com> | 4 | * Maintained by: Tejun Heo <tj@kernel.org> |
| 5 | * Please ALWAYS copy linux-ide@vger.kernel.org | 5 | * Please ALWAYS copy linux-ide@vger.kernel.org |
| 6 | * on emails. | 6 | * on emails. |
| 7 | * | 7 | * |