summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
*-----. Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', '...Joerg Roedel2011-10-2112-2515/+92Star
|\ \ \ \
| | | | * iommu/core: Convert iommu_found to iommu_presentJoerg Roedel2011-10-212-2/+4
| | | | *---. Merge branches 'debug/dma-api', 'arm/omap', 'arm/msm' and 'core' into api-2Joerg Roedel2011-09-0664-2822/+632Star
| | | | |\ \ \ | | | |_|/ / / | | |/| | / / | | |_|_|/ / | |/| | | |
| | | * | | iommu/omap: Migrate to the generic fault report mechanismOhad Ben-Cohen2011-09-141-2/+1Star
| | |/ / /
| | * | | omap: iommu: omapify 'struct iommu' and exposed APIOhad Ben-Cohen2011-08-265-50/+61
| | * | | omap: iommu: remove unused exported APIOhad Ben-Cohen2011-08-261-3/+0Star
| | * | | omap: iovmm: remove unused functionalityOhad Ben-Cohen2011-08-261-8/+0Star
| | * | | omap: iommu: stop exporting local functionsOhad Ben-Cohen2011-08-261-8/+0Star
| | * | | omap: iommu/iovmm: move to dedicated iommu folderOhad Ben-Cohen2011-08-266-2683/+0Star
| | * | | omap: iommu: migrate to the generic IOMMU APIOhad Ben-Cohen2011-08-266-105/+372
| | |/ /
* | | | Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-...Linus Torvalds2011-10-164-3/+11
|\ \ \ \
| * | | | ARM: 7128/1: vic: Don't write to the read-only register VIC_IRQ_STATUSZoltan Devai2011-10-151-1/+0Star
| * | | | ARM: 7122/1: localtimer: add header linux/errno.h explicitlyShawn Guo2011-10-151-0/+2
| * | | | ARM: 7117/1: perf: fix HW_CACHE_* events on Cortex-A9Will Deacon2011-10-151-2/+2
| * | | | ARM: 7113/1: mm: Align bank start to MAX_ORDER_NR_PAGESLinus Walleij2011-10-011-0/+7
* | | | | Merge branch 'stable' of git://github.com/cmetcalf-tilera/linux-tileLinus Torvalds2011-10-142-2/+2
|\ \ \ \ \
| * | | | | tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm filesChris Metcalf2011-10-132-2/+2
* | | | | | Merge branch 'x86-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tipLinus Torvalds2011-10-141-1/+1
|\ \ \ \ \ \
| * | | | | | x86: Default to vsyscall=native for nowAdrian Bunk2011-10-111-1/+1
* | | | | | | x86, mrst: use a temporary variable for SFI irqMika Westerberg2011-10-141-10/+12
|/ / / / / /
* | | | | | Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-10-104-12/+7Star
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'omap/fixes-for-3.1' into fixesArnd Bergmann2011-10-083-12/+6Star
| |\ \ \ \ \ \
| | * | | | | | ARM: OMAP: musb: Remove a redundant omap4430_phy_init call in usb_musb_initAxel Lin2011-09-301-3/+0Star
| | * | | | | | ARM: OMAP: Fix i2c init for twl4030Tony Lindgren2011-09-301-1/+2
| | * | | | | | ARM: OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1Bryan Buckley2011-09-301-8/+4Star
| * | | | | | | ARM: mach-ux500: enable fix for ARM errata 754322srinidhi kasagar2011-10-071-0/+1
| |/ / / / / /
* | | | | | | ARM: tegra: fix compilation error due to mach/hardware.h removalMarc Dietrich2011-10-101-1/+0Star
* | | | | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2011-10-1039-126/+164
|\ \ \ \ \ \ \
| * | | | | | | MIPS: Call oops_enter, oops_exit in dieNathan Lynch2011-10-011-1/+9
| * | | | | | | MIPS: Octeon: Enable C0_UserLocal probing.David Daney2011-09-241-1/+0Star
| * | | | | | | MIPS: No branches in delay slots for huge pages in handle_tlblDavid Daney2011-09-211-1/+2
| * | | | | | | MIPS: Don't clobber CP0_STATUS value for CONFIG_MIPS_MT_SMTCDavid Daney2011-09-211-2/+2
| * | | | | | | MIPS: Octeon: Select CONFIG_HOLES_IN_ZONEDavid Daney2011-09-211-0/+5
| * | | | | | | MIPS: PM: Use struct syscore_ops instead of sysdevs for PM (v2)Rafael J. Wysocki2011-09-211-30/+22Star
| * | | | | | | MIPS: Compat: Use 32-bit wrapper for compat_sys_futex.Yong Zhang2011-09-213-2/+9
| * | | | | | | MIPS: Do not use EXTRA_CFLAGSArnaud Lacombe2011-09-211-1/+1
| * | | | | | | MIPS: Alchemy: DB1200: Disable cascade IRQ in handlerManuel Lauss2011-09-212-7/+4Star
| * | | | | | | MIPS: Lantiq: Fix setting the PCI bus speed on AR9John Crispin2011-09-211-2/+7
| * | | | | | | MIPS: Lantiq: Fix external interrupt sourcesJohn Crispin2011-09-211-4/+2Star
| * | | | | | | MIPS: tlbex: Fix build error in R3000 code.Ralf Baechle2011-09-211-2/+1Star
| * | | | | | | MIPS: Alchemy: Include Au1100 in PM code.Manuel Lauss2011-09-211-8/+14
| * | | | | | | MIPS: Alchemy: Fix typo in MAC0 registrationManuel Lauss2011-09-211-1/+1
| * | | | | | | MIPS: MSP71xx: Fix build error.Ralf Baechle2011-09-211-2/+2
| * | | | | | | MIPS: Handle __put_user() sleeping.Ralf Baechle2011-09-211-0/+3
| * | | | | | | MIPS: Allow forced irq threadingThomas Gleixner2011-09-211-0/+1
| * | | | | | | MIPS: i8259: Mark cascade interrupt non-threadedLiming Wang2011-09-211-0/+1
| * | | | | | | MIPS: Loongson: Mark cascade interrupts IRQF_NO_THREADWu Zhangjin2011-09-212-1/+3
| * | | | | | | MIPS: Mark cascade and low level interrupts IRQF_NO_THREADWu Zhangjin2011-09-2112-10/+24
| * | | | | | | MIPS: Make the die_lock be rawWu Zhangjin2011-09-211-3/+3
| * | | | | | | MIPS: Ftrace: Fix the CONFIG_DYNAMIC_FTRACE=n compileThomas Gleixner2011-09-211-19/+20