diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-05 11:01:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-05 11:07:14 +1100 |
| commit | 5c424e7878706afd9077a2e91fde8f57496e43ce (patch) | |
| tree | 50a6c118798d91ab69a8c5b1bec530f95cc5f31c /arch/arm/mach-integrator/pci.c | |
| parent | cb61c109ca2c14394d23d327fe154f1cda15de10 (diff) | |
| parent | 74541be1cd6480943f84ae9116bfad1c90f1d3c0 (diff) | |
Merge commit 'timers/auto-timers-next'
Conflicts:
kernel/time/tick-common.c
Diffstat (limited to 'arch/arm/mach-integrator/pci.c')
0 files changed, 0 insertions, 0 deletions