diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-26 14:45:52 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-26 14:45:52 (GMT) |
commit | 7c526e1fef8d604a9ec022d9145bba5dbfe40a11 (patch) | |
tree | 0234bf6c439cb0b91c69ac0eed28c526d05cbf2f /arch/powerpc | |
parent | e8684605adf87d8e65f64ce7b0274d60a05085bd (diff) | |
parent | 74019224ac34b044b44a31dd89a54e3477db4896 (diff) | |
parent | a2a5ac8650b570bea3cb3614f77739dcd07d6632 (diff) | |
parent | 37bebc70d7ad4144c571d74500db3bb26ec0c0eb (diff) | |
download | linux-fsl-qoriq-7c526e1fef8d604a9ec022d9145bba5dbfe40a11.tar.xz |
Merge branches 'timers/new-apis', 'timers/ntp' and 'timers/urgent' into timers/core