summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2012-01-1414-118/+214
|\
| * GPIO: sa1100: implement proper gpiolib gpio_to_irq conversionRussell King2012-01-132-3/+6
| * Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into ...Grant Likely2012-01-05353-2524/+5031
| |\
| | * gpio: pl061: remove combined interruptRob Herring2012-01-051-36/+8
| | * gpio: pl061: convert to use generic irq chipRob Herring2012-01-052-48/+27
| | * ARM: realview: convert pl061 no irq to 0 instead of -1Rob Herring2012-01-045-15/+0
| | * gpio: pl061: convert to use 0 for no irqRob Herring2012-01-042-5/+5
| | * gpio: pl061: use chained_irq_* functions in irq handlerRob Herring2012-01-041-2/+4
| * | GPIO: add bindings for managed devicesJohn Crispin2012-01-043-1/+95
| * | GPIO/pl061: Add suspend resume capabilityDeepak Sikri2012-01-041-0/+68
| * | drivers/gpio/gpio-tegra.c: use devm_request_and_ioremapJulia Lawall2012-01-021-8/+1
* | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-01-14354-8396/+23172
|\ \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| *-----------------. \ \ Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/...Ralf Baechle2012-01-11194-2353/+15423
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | MIPS: Netlogic: Mark Netlogic chips as SMT capableHillf Danton2011-12-071-4/+7
| | | | | | | | | | | * | | MIPS: Netlogic: Add support for XLP 3XX coresJayachandran C2011-12-073-12/+21
| | | | | | | | | | | * | | MIPS: Netlogic: Merge some of XLR/XLP wakup codeJayachandran C2011-12-0713-230/+234
| | | | | | | | | | | * | | MIPS: Netlogic: Add default XLP config.Jayachandran C2011-12-071-0/+570
| | | | | | | | | | | * | | MIPS: Netlogic: Add XLP makefiles and configJayachandran C2011-12-077-0/+50
| | | | | | | | | | | * | | MIPS: Netlogic: Add XLP platform files for XLP SoCJayachandran C2011-12-0716-4/+1938
| | | | | | | | | | | * | | MIPS: Netlogic: XLP CPU support.Jayachandran C2011-12-075-8/+37
| | | | | | | | | | | * | | MIPS: Netlogic: Update default configJayachandran C2011-12-071-8/+8
| | | | | | | | | | | * | | MIPS: Netlogic: Move code common with XLP to common/Jayachandran C2011-12-0719-441/+698
| | | | | | | | | | | * | | MIPS: Netlogic: No need to set -Werror in mips/xlrJayachandran C2011-12-071-2/+0
| | | | | | | | | | | * | | MIPS: Netlogic: Use CPU_XLR instead of NLM_XLRJayachandran C2011-12-074-7/+3
| | | | | | | | | | | * | | MIPS: Netlogic: Style fixes for PlatformJayachandran C2011-12-071-5/+5
| | | | | | | | | | | * | | MIPS: Netlogic: Add basic MSI support for XLR/XLSGanesan Ramalingam2011-12-074-1/+140
| | | | | | | | | | | * | | MIPS: Netlogic: Avoid unnecessary cache flushesJayachandran C2011-12-071-3/+2
| | | | | | | | | | | * | | MIPS: Netlogic: add r4k_wait as the cpu_waitJayachandran C2011-12-071-0/+1
| | | | | | | | | | | * | | MIPS: Netlogic: Change load addressJayachandran C2011-12-071-1/+1
| | | | | | | | | | |/ / / | | | | | | | | | |/| | |
| | | | | | | | | | * | | MIPS/Perf-events: Cleanup event->destroy at event initDeng-Cheng Zhu2011-12-071-9/+6
| | | | | | | | | | * | | MIPS/Perf-events: Remove pmu and event state checking in validate_event()Deng-Cheng Zhu2011-12-071-15/+3
| | | | | | | | | | * | | MIPS/Perf-events: Remove erroneous check on active_eventsDeng-Cheng Zhu2011-12-071-5/+0
| | | | | | | | | | * | | MIPS/Perf-events: Don't do validation on raw eventsDeng-Cheng Zhu2011-12-071-32/+2
| | | | | | | | | |/ / /
| | | | | | | | * | | | MIPS Kprobes: Support branch instructions probingManeesh Soni2011-12-072-33/+117
| | | | | | | | * | | | MIPS Kprobes: Refactor branch emulationManeesh Soni2011-12-073-45/+90
| | | | | | | | * | | | MIPS Kprobes: Deny probes on ll/sc instructionsManeesh Soni2011-12-071-0/+31
| | | | | | | | * | | | MIPS Kprobes: Fix OOPS in arch_prepare_kprobe()Maneesh Soni2011-12-071-3/+12
| | | | | | | | |/ / /
| | | | | | * | | | | MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.Chandrakala Chavva2011-12-081-2/+0
| | | | | | * | | | | MIPS: Octeon: Add support for OCTEON II PCIeDavid Daney2011-12-081-326/+1023
| | | | | | * | | | | MIPS: Octeon: Update PCI Latency timer and enable more error reporting.David Daney2011-12-081-10/+6
| | | | | | * | | | | MIPS: Octeon: Update DMA mapping operations for OCTEON II processors.David Daney2011-12-072-3/+23
| | | | | | * | | | | MIPS: Octeon: Update feature test functions for new chips and features.David Daney2011-12-072-30/+126
| | | | | | * | | | | MIPS: Octeon: Update SOC PCI related register definitions for new chips.David Daney2011-12-077-83/+4909
| | | | | | * | | | | MIPS: Octeon: Rearrange CVMX files in preperation for device treeDavid Daney2011-12-0711-24/+114
| | | | | | * | | | | MIPS: Octeon: Update bootloader board type constants.David Daney2011-12-073-3/+95
| | | | | | * | | | | MIPS: Octeon: Move some Ethernet support files out of staging.David Daney2011-12-0766-376/+120
| | | | | | * | | | | MIPS: Oceton: Update model detection code for new chips.David Daney2011-12-073-188/+1179
| | | | | | * | | | | MIPS: Octeon: Update struct cvmx_bootinfo to v3.David Daney2011-12-071-2/+8
| | | | | | | |/ / / | | | | | | |/| | |
| | | | | * | | | | MIPS: BMIPS: Add SMP support code for BMIPS43xx/BMIPS5000Kevin Cernekee2011-12-074-0/+717
| | | | | * | | | | MIPS: Add board_ebase_setup()Kevin Cernekee2011-12-072-0/+4
OpenPOWER on IntegriCloud