diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-29 13:00:13 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-29 13:23:51 +1100 |
commit | b4f353fc9b37de05de1ff9d3e9426d96c23cf10a (patch) | |
tree | 0129b9e25dcbb781e4e164e15f94305fb9e42494 /drivers/pci/msi.c | |
parent | 6022fa10445e8dcb5620cf6b8694751d8f486062 (diff) | |
parent | f7cbe205471976a23e3caabda0139f93277c2877 (diff) |
Merge commit 'timers/auto-timers-next'
Conflicts:
kernel/time/tick-sched.c
sound/drivers/pcsp/pcsp.c
Diffstat (limited to 'drivers/pci/msi.c')
0 files changed, 0 insertions, 0 deletions