summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* arch/powerpc/include/asm/fsldma.h needs slab.hIra W. Snyder2010-09-091-0/+1
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-09-0932-172/+424
|\
| * ARM: Update mach-typesRussell King2010-09-091-2/+96
| * ARM: Partially revert "Auto calculate ZRELADDR and provide option for excepti...Russell King2010-09-094-95/+10
| * Merge branch 'origin'Russell King2010-09-0923-66/+129
| |\
| * | ARM: Ensure PTE modifications via dma_alloc_coherent are visibleRussell King2010-09-081-0/+2
| * | ARM: 6359/1: ep93xx: move clock initialization earlierMika Westerberg2010-09-081-1/+1
| * | Revert "[ARM] pxa: remove now unnecessary dma_needs_bounce()"Russell King2010-09-082-8/+8
| * | ARM: 6352/1: perf: fix event validationWill Deacon2010-09-021-2/+2
| * | ARM: 6344/1: Mark CPU_32v6K as depended on CPU_V7Catalin Marinas2010-09-021-1/+1
| * | Merge branch 'imx-for-2.6.36' of git://git.pengutronix.de/git/imx/linux-2.6Russell King2010-09-019-33/+68
| |\ \
| | * | ARM: imx: set cache line size to 64 bytes for i.MX5Jason Wang2010-08-211-0/+1
| | * | mx5/clock: fix clear bit fields issue in _clk_ccgr_disable functionJason Wang2010-08-211-1/+1
| | * | mxc/tzic: add base address when accessing TZIC registersJason Wang2010-08-211-2/+3
| | * | clock-imx35: Calculate the base clock rate for the IPU unitJuergen Beisert2010-08-171-1/+28
| | * | clock-imx35: correct arm and ahb clock calculationMarc Kleine-Budde2010-08-171-2/+2
| | * | clock-imx35: fix divider if ahb is source for ipg_perMarc Kleine-Budde2010-08-171-1/+1
| | * | i.MX35: remove get_3_3_div helper functionSascha Hauer2010-08-171-15/+9
| | * | mx35: Fix boot ROM hang in internal boot modeHans J. Koch2010-08-171-4/+16
| | * | eukrea-baseboards: fix the merge in one fileEric Bénard2010-08-165-8/+8
| * | | Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/px...Russell King2010-09-014-5/+5
| |\ \ \
| | * | | ARM: pxa: Make id const in pwm_probe()Uwe Kleine-König2010-08-301-1/+1
| | * | | ARM: pxa: fix CI_HSYNC and CI_VSYNC MFP defines for pxa300Axel Lin2010-08-301-2/+2
| | * | | ARM: pxa: remove __init from cpufreq_driver->init()Eric Miao2010-08-302-2/+2
| * | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6Russell King2010-09-015-20/+220
| |\ \ \ \
| | * | | | ARM: mach-shmobile: ap4evb: fix write protect for SDHI1Arnd Hannemann2010-08-201-0/+2
| | * | | | ARM: mach-shmobile: ap4evb: modify FSI2 IDKuninori Morimoto2010-08-181-1/+1
| | * | | | ARM: mach-shmobile: do not enable the PLLC2 clock on initGuennadi Liakhovetski2010-08-181-1/+0
| | * | | | ARM: mach-shmobile: Clock framework comment fixMagnus Damm2010-08-181-1/+3
| | * | | | ARM: mach-shmobile: Fix up gpio-leds pdata definition.Paul Mundt2010-08-161-1/+1
| | * | | | ARM: mach-shmobile: AP4EVB: use gpio-leds for leds.Arnd Hannemann2010-08-161-14/+38
| | * | | | ARM: mach-shmobile: add clock definitions for CEU and CSI2Guennadi Liakhovetski2010-08-161-1/+5
| | * | | | ARM: mach-shmobile: Runtime PM V3Magnus Damm2010-08-163-2/+171
| | | |/ / | | |/| |
| * | | | ARM: 6343/1: wire up fanotify and prlimit64 syscalls on ARMMikael Pettersson2010-09-012-0/+6
| * | | | ARM: 6330/1: perf: reword comments relating to perf_event_do_pendingWill Deacon2010-09-012-5/+5
| | |/ / | |/| |
* | | | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2010-09-085-13/+13
|\ \ \ \
| * | | | x86, mcheck: Avoid duplicate sysfs links/files for thresholding banksAndreas Herrmann2010-09-051-2/+2
| * | | | x86: Fix the address space annotations of iomap_atomic_prot_pfn()Francisco Jerez2010-09-052-5/+5
| * | | | x86, mm: Fix CONFIG_VMSPLIT_1G and 2G_OPT trampolineHugh Dickins2010-08-241-2/+1
| * | | | x86, hwmon: Fix unsafe smp_processor_id() in thermal_throttle_add_devSergey Senozhatsky2010-08-201-4/+5
* | | | | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-09-084-25/+73
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | perf, x86: Try to handle unknown nmis with an enabled PMURobert Richter2010-09-031-13/+46
| * | | | perf, x86: Fix handle_irq return valuesPeter Zijlstra2010-09-032-3/+8
| * | | | perf, x86: Fix accidentally ack'ing a second event on intel perf counterDon Zickus2010-09-031-4/+2
| * | | | Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/o...Ingo Molnar2010-09-011-5/+17
| |\ \ \ \
| | * | | | oprofile, x86: fix init_sysfs() function stubRobert Richter2010-09-011-2/+4
| | * | | | oprofile, x86: fix init_sysfs error handlingRobert Richter2010-08-311-3/+13
| | | |_|/ | | |/| |
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba...Linus Torvalds2010-09-071-2/+4
|\ \ \ \ \
| * | | | | x86/PCI: only define pci_domain_nr if PCI and PCI_DOMAINS are setJesse Barnes2010-08-171-2/+4
* | | | | | Merge branch 'for-linus' of git://android.kernel.org/kernel/tegraLinus Torvalds2010-09-071-0/+1
|\ \ \ \ \ \