summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* x86/PCI: build amd_bus.o only when CONFIG_AMD_NB=yBjorn Helgaas2012-01-121-1/+2
* Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-shLinus Torvalds2012-01-1128-92/+9572
|\
| * Merge branch 'rmobile/smp' into rmobile-latestPaul Mundt2012-01-126-8/+201
| |\
| | * ARM: mach-shmobile: r8a7779 SMP support V3Magnus Damm2012-01-126-8/+201
| * | arm: mach-shmobile: add a resource name for shdmaShimoda, Yoshihiro2012-01-122-4/+4
| |/
| *-. Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latestPaul Mundt2012-01-1025-220/+4582
| |\ \
| | | * ARM: mach-shmobile: Add marzen defconfig.Paul Mundt2012-01-101-0/+87
| | | * ARM: mach-shmobile: r8a7779 power domain support V2Magnus Damm2012-01-105-0/+280
| | | * ARM: mach-shmobile: Fix up marzen build for recent GIC changes.Paul Mundt2012-01-101-1/+1
| | | * ARM: mach-shmobile: r8a7779 PFC function supportMagnus Damm2012-01-102-1/+2432
| | | * Merge branch 'rmobile/core' into rmobile/marzenPaul Mundt2012-01-104-2/+38
| | | |\
| | | | * ARM: mach-shmobile: Flush caches in platform_cpu_die()Magnus Damm2012-01-091-1/+30
| | | | * ARM: mach-shmobile: Allow SoC specific CPU kill codeMagnus Damm2012-01-093-1/+8
| | | | * ARM: mach-shmobile: Fix headsmp.S code to use CPUINITMagnus Damm2012-01-091-1/+1
| | | * | ARM: mach-shmobile: clock-r8a7779: clkz/clkzs supportKuninori Morimoto2012-01-091-0/+29
| | | * | ARM: mach-shmobile: clock-r8a7779: add DIV4 clock supportKuninori Morimoto2012-01-091-17/+59
| | | * | ARM: mach-shmobile: Marzen LAN89218 supportMagnus Damm2012-01-091-0/+36
| | | * | ARM: mach-shmobile: Marzen SCIF2/SCIF4 supportMagnus Damm2012-01-091-0/+9
| | | * | ARM: mach-shmobile: r8a7779 PFC GPIO-only support V2Magnus Damm2012-01-096-1/+540
| | | * | ARM: mach-shmobile: r8a7779 and Marzen base support V2Magnus Damm2012-01-098-0/+527
| | | | |
| | | | \
| | | *-. \ Merge branches 'common/pfc' and 'common/clkfwk' into rmobile/marzenPaul Mundt2012-01-0911-218/+442
| | | |\ \ \
| | | | * | | sh: pfc: Unlock register supportMagnus Damm2012-01-092-12/+12
| | | | * | | sh: pfc: Variable bitfield width config register supportMagnus Damm2012-01-092-12/+41
| | | | * | | sh: pfc: Add config_reg_helper() functionMagnus Damm2012-01-091-44/+32
| | | | * | | sh: pfc: Convert index to field and value pairMagnus Damm2012-01-091-27/+18
| | | | * | | sh: pfc: Add gpio_read_bit() for data register accessMagnus Damm2012-01-091-1/+14
| | * | | | | ARM: mach-shmobile: Add kota2 defconfig.Paul Mundt2012-01-101-0/+122
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'rmobile/bonito' into rmobile-latestPaul Mundt2012-01-105-3/+607
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | ARM: mach-shmobile: Unset initramfs source in bonito defconfig.Paul Mundt2011-11-111-1/+1
| | * | | | ARM: mach-shmobile: bonito: add SMSC9221 supportKuninori Morimoto2011-11-111-0/+33
| | * | | | ARM: mach-shmobile: bonito: add FPGA irq demuxKuninori Morimoto2011-11-111-0/+78
| | * | | | ARM: mach-shmobile: bonito: Add LCDC0 supportKuninori Morimoto2011-11-112-1/+122
| | * | | | ARM: mach-shmobile: bonito: add PMIC settingsKuninori Morimoto2011-11-111-0/+53
| | * | | | ARM: mach-shmobile: bonito: Add dip-switch selectorKuninori Morimoto2011-11-111-17/+71
| | * | | | ARM: mach-shmobile: add bonito board support.Kuninori Morimoto2011-11-114-2/+267
| * | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Paul Mundt2012-01-095356-134734/+191269
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branch 'rmobile-fixes-for-linus' into rmobile-latestPaul Mundt2011-11-24324-2391/+2902
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rmobile/a1' into rmobile-latestPaul Mundt2011-11-119-1/+4525
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | ARM: mach-shmobile: r8a7740: add INTC supportKuninori Morimoto2011-11-114-29/+614
| | * | | | | ARM: mach-shmobile: r8a7740: add i2c supportKuninori Morimoto2011-11-111-0/+106
| | * | | | | ARM: mach-shmobile: r8a7740: add PFC support.Kuninori Morimoto2011-11-112-0/+2563
| | * | | | | ARM: mach-shmobile: R-Mobile A1 support.Kuninori Morimoto2011-11-118-1/+1271
| |/ / / / /
* | | | | | Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-shLinus Torvalds2012-01-1151-1651/+897
|\ \ \ \ \ \
| * | | | | | sh: magicpanelr2: Update for parse_mtd_partitions() fallout.Paul Mundt2012-01-121-32/+2
| * | | | | | sh: mach-rsk: Update for parse_mtd_partitions() fallout.Paul Mundt2012-01-121-37/+6
| * | | | | | Merge branch 'sh/nommu' into sh-latestPaul Mundt2012-01-122874-74447/+139481
| |\ \ \ \ \ \
| | * | | | | | sh: sh2a: Improve cache flush/invalidate functionsPhil Edworthy2012-01-121-39/+84
| * | | | | | | Merge branch 'sh/hwblk' into sh-latestPaul Mundt2012-01-1218-494/+8
| |\ \ \ \ \ \ \
| | * | | | | | | sh: sh7722: fix Oops: remove empty clock entriesGuennadi Liakhovetski2011-11-241-8/+5
| | * | | | | | | sh: sh7723.h: bugfix: remove unused clock indexKuninori Morimoto2011-11-241-2/+1
OpenPOWER on IntegriCloud