diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-02-26 14:43:43 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-26 14:43:43 -0800 |
| commit | 0f830e5c902106e7fe51460fd1e3263bea72bf41 (patch) | |
| tree | b83090bb272fce3ebda9aac311f2185ce78be7a3 /include/linux/timerqueue.h | |
| parent | Merge branch 'for-3.4/soc' into for-3.4/t30-smp (diff) | |
| parent | gpio: tegra: Fix build issue due to irq_domain rework. (diff) | |
Merge branch 'for-3.4/soc-drivers' into for-3.4/t30-smp
Conflicts:
arch/arm/mach-tegra/Makefile
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions