diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 23:12:55 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 23:12:55 +0100 |
commit | 6a385db5ce7f1fd2c68ec511e44587b67dab8fca (patch) | |
tree | 9324c8ae6f7be54b9fdbd6b60f759292aa727b1f /drivers/watchdog/iTCO_vendor_support.c | |
parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
parent | 4369f1fb7cd4cf777312f43e1cb9aa5504fc4125 (diff) |
Merge branch 'core/percpu' into x86/core
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'drivers/watchdog/iTCO_vendor_support.c')
0 files changed, 0 insertions, 0 deletions