diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-17 13:16:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 13:16:08 +0100 |
| commit | 948a7b2b5e2bf126fb697aeb11ff379b2c85dd2e (patch) | |
| tree | 727c744438a44d85f7dc340b1bfcb3b127c84f13 /drivers/rtc/rtc-twl4030.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/travis... (diff) | |
| parent | sparseirq: fix !SMP building, #2 (diff) | |
| download | linux-948a7b2b5e2bf126fb697aeb11ff379b2c85dd2e.tar.xz linux-948a7b2b5e2bf126fb697aeb11ff379b2c85dd2e.zip | |
Merge branch 'irq/sparseirq' into cpus4096
Conflicts:
arch/x86/kernel/io_apic.c
Merge irq/sparseirq here, to resolve conflicts.
Diffstat (limited to 'drivers/rtc/rtc-twl4030.c')
0 files changed, 0 insertions, 0 deletions