summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-05-1919-1852/+450
|\
| * Merge branch 'devel-stable' into develRussell King2010-05-172832-8062/+28746
| |\
| | * Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-s...Russell King2010-05-171-3/+4
| | |\
| | | * serial: Use s3c2440 driver for S3C2416 SoCYauhen Kharuzhy2010-05-061-3/+4
| | * | [ARM] pxa: add namespace on sspHaojian Zhuang2010-05-111-4/+4
| | * | [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecondEric Miao2010-05-111-1/+1
| | * | [ARM] pxa: add support for Voipac PXA270 PCMCIAMarek Vasut2010-05-113-1/+232
| | * | input: remove obsolete {corgi,spitz,tosa}kbd.cEric Miao2010-05-115-1382/+0
| | * | [ARM] pxa/tosa: move CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES to mach/KconfigEric Miao2010-05-111-10/+0
| | * | [ARM] pxa: move ssp into common plat-pxaHaojian Zhuang2010-05-111-1/+1
| | * | [ARM] pxa: merge regs-ssp.h into ssp.hEric Miao2010-05-111-1/+0
| | * | [ARM] pxa: correct SSCR0_SCR to support multiple SoCsEric Miao2010-05-111-7/+7
| | * | input: remove now deprecated corgi_ts.c touchscreen driverEric Miao2010-05-113-402/+0
| | | |
| | \ \
| | \ \
| | \ \
| *---. \ \ Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap',...Russell King2010-05-173-6/+21
| |\ \ \ \ \
| | | | * | | ARM: Add Versatile Express supportRussell King2010-05-021-1/+1
| | | |/ / / | | |/| | |
| | | * | | ARM: 6033/1: ARM: MMCI: pass max frequency from platformLinus Walleij2010-04-141-1/+12
| | | * | | ARM: 6032/1: ARM: MMCI: support 8bit mode on the ST Micro versionLinus Walleij2010-04-142-4/+8
| | |/ / /
| * | | | ARM: 5966/1: at91_udc HW glitchHarro Haan2010-05-051-0/+7
| * | | | ARM: 6092/1: atmel_serial: support for RS485 communicationsClaudio Scordino2010-05-041-34/+173
| |/ / /
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-05-1912-167/+1396
|\ \ \ \
| * \ \ \ Merge branch 'sh/driver-core'Paul Mundt2010-05-131-1/+1
| |\ \ \ \
| | * | | | driver core: Early dev_name() depends on slab_is_available().Paul Mundt2010-05-131-1/+1
| * | | | | sh: simplify WARN usage in SH clock driverGuennadi Liakhovetski2010-05-131-5/+2
| * | | | | sh: move sh clock-cpg.c contents to drivers/sh/clk-cpg.cMagnus Damm2010-05-132-0/+299
| * | | | | sh: move sh clock.c contents to drivers/sh/clk.Magnus Damm2010-05-132-0/+549
| * | | | | Merge branch 'sh/stable-updates'Paul Mundt2010-04-262629-2584/+21396
| |\ \ \ \ \
| * | | | | | SH: constify multiple DMA related objects and references to themGuennadi Liakhovetski2010-04-261-5/+7
| * | | | | | sh: intc: IRQ auto-distribution support.Paul Mundt2010-04-152-52/+159
| * | | | | | sh: Disable IRQ balancing for timer and IPI IRQs.Paul Mundt2010-04-153-3/+6
| * | | | | | sh: intc: userimask support.Paul Mundt2010-04-132-2/+80
| * | | | | | sh: intc: Tidy up loglevel mismatches.Paul Mundt2010-04-131-4/+7
| * | | | | | sh: intc: Provide sysdev name for intc controllers.Paul Mundt2010-04-131-0/+16
| * | | | | | Merge branch 'sh/stable-updates'Paul Mundt2010-04-05157-2437/+3619
| |\ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| *---. \ \ \ \ \ \ Merge branches 'sh/intc-extension', 'sh/dmaengine', 'sh/serial-dma' and 'sh/c...Paul Mundt2010-03-308-130/+305
| |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | clocksource: Deprecate clock string across the SH drivers.Paul Mundt2010-03-293-12/+24
| | | | * | | | | | | Merge branch 'sh/driver-core' into sh/clkfwkPaul Mundt2010-03-291-7/+8
| | | | |\ \ \ \ \ \ \ | | | | | | |_|/ / / / | | | | | |/| | | | |
| | | | | * | | | | | driver core: Convert to kasprintf() for early dev_name().Paul Mundt2010-03-291-7/+8
| | | | * | | | | | | serial: sh-sci: clkdev updates for MSTP gating.Paul Mundt2010-03-101-20/+37
| | | | * | | | | | | Merge branch 'sh/driver-core' into sh/clkfwkPaul Mundt2010-03-10175-804/+2449
| | | | |\| | | | | |
| | | | | * | | | | | clocksource: Use dev_name() universally across the SH drivers.Paul Mundt2010-03-103-47/+37
| | | | | * | | | | | driver core: Early dev_name() support.Paul Mundt2010-03-101-0/+19
| | | * | | | | | | | SH: extend SCI DMA support to work on SCIFA portsGuennadi Liakhovetski2010-03-231-33/+81
| | | * | | | | | | | dmaengine: shdma: Introduce include/linux/sh_dma.hMagnus Damm2010-03-232-4/+2
| | | * | | | | | | | serial: sh-sci: Use sg_dma_len() and sg_dma_address()Magnus Damm2010-03-231-8/+6
| | | * | | | | | | | dmaengine: shdma: Common SH_DMA_SLAVE_NUMBERMagnus Damm2010-03-232-2/+3
| | | * | | | | | | | dmaengine: shdma: Remove sh_dmae_slave_chan_id enumMagnus Damm2010-03-232-6/+6
| | * | | | | | | | | sh: INTC ioremap supportMagnus Damm2010-03-191-10/+74
| | * | | | | | | | | sh: add INTC out of memory error handlingMagnus Damm2010-03-191-1/+28
| | | |_|_|_|_|/ / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds2010-05-1922-305/+396
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [S390] drivers/s390/char: Use kmemdupJulia Lawall2010-05-171-8/+6