diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-18 11:24:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-18 11:25:55 +0200 |
| commit | eec19d1a0d04c80e66eef634f7b8f460f2ca5643 (patch) | |
| tree | e68f24938d458fc776b76dc6037f9a2d03f09403 /include/linux/pci_ids.h | |
| parent | f726a697d06102e7a1fc0a87308cb30a84580205 (diff) | |
| parent | a018540141a931f5299a866907b27886916b4374 (diff) | |
Merge branch 'linus' into timers/core
Resolve semantic conflict in kernel/time/timekeeping.c.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/pci_ids.h')
0 files changed, 0 insertions, 0 deletions