diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 13:06:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 13:06:32 -0700 |
| commit | b34e138e8bcbdfd8da0c4b063a689d54e9ba9f16 (patch) | |
| tree | f580f0f531702b14d22e9f3a5d00fdbfee59dd51 /arch/x86/Makefile | |
| parent | 445aef374594207b278477dfd98fc5d1498d353a (diff) | |
| parent | 324808c2bc190e9424200e73faab1045df9b7d2e (diff) | |
| download | talos-op-linux-b34e138e8bcbdfd8da0c4b063a689d54e9ba9f16.tar.gz talos-op-linux-b34e138e8bcbdfd8da0c4b063a689d54e9ba9f16.zip | |
Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score
* 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score:
score: Use generic show_interrupts()
score: Convert to new irq function names
score: lost a semicolon in asm/irqflags.h
score: Select GENERIC_HARDIRQS_NO_DEPRECATED
score: Convert irq_chip to new functions
Diffstat (limited to 'arch/x86/Makefile')
0 files changed, 0 insertions, 0 deletions
