summaryrefslogtreecommitdiffstats
path: root/arch/s390/oprofile/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-25 17:46:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-25 17:46:34 -0700
commit62d00867514ae1c81ab5e809e189ca159536daee (patch)
treef6662310973b122a5ae891aca65b3a2732e9b5cb /arch/s390/oprofile/Makefile
parentbe4d250ab41e13f8f945be6896695e870b38ba31 (diff)
parentc8fb4022cf61a0462ad01525e0b3dd00410e9eac (diff)
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (49 commits) MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 board MIPS: JZ4740: qi_lb60: Add gpio-charger device MIPS: Wire up syncfs(2). MIPS: Hook up name_to_handle_at, open_by_handle_at and clock_adjtime syscalls. MIPS: VR41xx: Convert to new irq_chip functions MIPS: TXx9: Convert to new irq_chip functions MIPS: SNI: Convert to new irq_chip functions MIPS: Sibyte: Convert to new irq_chip functions MIPS: IP32: Convert to new irq_chip functions MIPS: IP27: Convert to new irq_chip functions MIPS: IP22/IP28: Convert to new irq_chip functions MIPS: RB532: Convert to new irq_chip functions MIPS: PowerTV: Convert to new irq_chip functions MIPS: PNX8550: Convert to new irq_chip functions MIPS: PNX83xx: Convert to new irq_chip functions MIPS: msp71xx: Convert to new irq_chip functions MIPS: Loongson: Convert to new irq_chip functions MIPS: Use generic show_interrupts() MIPS: SMTC: Cleanup the hook mess and use irq_data MIPS: SMTC: Use irq_data in smtc_forward_irq() ...
Diffstat (limited to 'arch/s390/oprofile/Makefile')
0 files changed, 0 insertions, 0 deletions