summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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: use ioread32/iowrite32 and mapped_reg for div6Magnus Damm2011-12-091-10/+10
| | | | * | sh: use ioread32/iowrite32 and mapped_reg for div4Magnus Damm2011-12-091-8/+8
| | | | * | sh: use ioread32/iowrite32 and mapped_reg for mstp32Magnus Damm2011-12-091-4/+4
| | | | * | sh: extend clock struct with mapped_reg memberMagnus Damm2011-12-092-2/+8
| | | | * | sh: clkfwk: clock-sh73a0: all div6_clks use SH_CLK_DIV6_EXT()Kuninori Morimoto2011-12-062-22/+126
| | | | * | sh: clkfwk: clock-sh7724: all div6_clks use SH_CLK_DIV6_EXT()Kuninori Morimoto2011-12-062-15/+26
| | | | * | sh: clock-sh7723: add CLKDEV_ICK_ID for cleanupKuninori Morimoto2011-12-061-63/+13
| | | | * | sh: clkfwk: setup clock parent from current register valueKuninori Morimoto2011-11-244-8/+46
| | | * | | 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
| | | * | | sh: pfc: ioremap() supportMagnus Damm2011-12-092-24/+124
| * | | | | 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
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | audit: always follow va_copy() with va_end()Jesper Juhl2012-01-081-2/+3
| * | | | drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()Jesper Juhl2012-01-081-0/+1
| * | | | Merge tag 'infiniband-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-01-0823-68/+109
| |\ \ \ \
| | | \ \ \
| | | \ \ \
| | | \ \ \
| | | \ \ \
| | | \ \ \
| | | \ \ \
| | | \ \ \
| | | \ \ \
| | *-------. \ \ \ Merge branches 'cma', 'misc', 'mlx4', 'nes', 'qib' and 'uverbs' into for-nextRoland Dreier2012-01-0419-58/+99
| | |\ \ \ \ \ \ \ \
| | | | | | | * | | | IB/uverbs: Protect QP multicast listEli Cohen2012-01-041-4/+17
| | | | | | * | | | | IB/qib: Default some module parameters optimallyMike Marciniszyn2012-01-042-3/+3
| | | | | | * | | | | IB/qib: Optimize locking for get_txreq()Mike Marciniszyn2012-01-041-10/+33
| | | | | | * | | | | IB/qib: Fix a possible data corruption when receiving packetsRam Vepa2012-01-043-4/+10
| | | | | | * | | | | IB/qib: Eliminate 64-bit jiffies useMike Marciniszyn2012-01-044-22/+20