diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-04-24 14:11:20 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-04-24 14:11:20 +1000 |
| commit | 973e2abd15326114ff9a099d6dfe0ef6be6fc7e6 (patch) | |
| tree | 06ef7573e06500a4999a755006eb9a95bdf85ffa /arch/x86/include/asm/cputime.h | |
| parent | 5676005acf26ab7e924a8438ea4746e47d405762 (diff) | |
| parent | 016af59f0f8cd10f27773df8f0034b5f3b46a138 (diff) | |
Merge remote-tracking branch 'mpe/master' into next
Merge the tentative powerpc-next branch maintained by Michael
while I was on vacation
Diffstat (limited to 'arch/x86/include/asm/cputime.h')
0 files changed, 0 insertions, 0 deletions