summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2013-07-1314-54/+86
|\
| * Merge branch '3.10-fixes' into mips-for-linux-nextRalf Baechle2013-07-122-1/+3
| |\
| | * WATCHDOG: sb_wdog: Fix 32 bit build failureRalf Baechle2013-06-211-1/+1
| | * RAPIDIO: IDT_GEN2: Fix build error.Ralf Baechle2013-06-201-0/+2
| * | SSB: Kconfig: Amend SSB_EMBEDDED dependenciesMarkos Chandras2013-07-011-1/+1
| * | tty/8250_dw: Add support for OCTEON UARTS.David Daney2013-07-011-39/+69
| * | MIPS: OCTEON: Rename Kconfig CAVIUM_OCTEON_REFERENCE_BOARD to CAVIUM_OCTEON_SOCDavid Daney2013-06-1010-13/+13
| |/
* | Merge git://www.linux-watchdog.org/linux-watchdogLinus Torvalds2013-07-1331-726/+592
|\ \
| * | watchdog: hpwdt: Add check for UEFI bitsMingarelli, Thomas2013-07-111-4/+7
| * | watchdog: softdog: remove replaceable ping operationKim, Milo2013-07-111-1/+0
| * | watchdog: New watchdog driver for MEN A21 watchdogsJohannes Thumshirn2013-07-113-0/+283
| * | Watchdog: fix clearing of the watchdog interruptRussell King2013-07-111-3/+1
| * | Watchdog: allow orion_wdt to be built for DoveRussell King2013-07-112-1/+4
| * | watchdog: Add Broadcom BCM2835 watchdog timer driverLubomir Rintel2013-07-113-0/+201
| * | watchdog: delete mpcore_wdt driverViresh Kumar2013-07-113-464/+0
| * | watchdog: xilinx: Setup the origin compatible stringMichal Simek2013-07-111-0/+1
| * | watchdog: xilinx: Fix driver headerMichal Simek2013-07-111-20/+10
| * | watchdog: wdrtas: don't use custom version of print_hex_dumpAndy Shevchenko2013-07-111-26/+3
| * | watchdog: core: don't try to stop device if not runningHector Palacios2013-07-111-2/+4
| * | watchdog: jz4740: Pass device to clk_getLars-Peter Clausen2013-07-111-1/+1
| * | watchdog: twl4030: Remove redundant platform_set_drvdata()Sachin Kamat2013-07-111-4/+1
| * | watchdog: mpcore: Remove redundant platform_set_drvdata()Sachin Kamat2013-07-111-2/+0
| * | watchdog: da9055: use platform_{get,set}_drvdata()Jingoo Han2013-07-111-2/+2
| * | watchdog: da9052: use platform_{get,set}_drvdata()Jingoo Han2013-07-111-2/+2
| * | watchdog: cpwd: use platform_{get,set}_drvdata()Jingoo Han2013-07-111-2/+2
| * | watchdog: s3c2410_wdt: convert s3c2410wdt to dev_pm_opsJingoo Han2013-07-111-10/+8
| * | watchdog: s3c2410_wdt: use dev_err()/dev_info() instead of pr_err()/pr_info()Jingoo Han2013-07-111-2/+2
| * | watchdog: wm831x: use platform_{get,set}_drvdata()Jingoo Han2013-07-111-2/+2
| * | watchdog: wm831x_wdt: use devm_gpio_request_one()Jingoo Han2013-07-111-11/+6
| * | watchdog: mtx1-wdt: use devm_gpio_request_one()Jingoo Han2013-07-111-2/+1
| * | watchdog: sp805_wdt: use devm_clk_get()Jingoo Han2013-07-111-5/+2
| * | watchdog: shwdt: Remove redundant platform_set_drvdata()Sachin Kamat2013-07-111-2/+0
| * | watchdog: shwdt: use devm_clk_get()Jingoo Han2013-07-111-12/+4
| * | watchdog: pnx4008_wdt: use devm_clk_get()Jingoo Han2013-07-111-5/+2
| * | watchdog: imx2_wdt: use devm_clk_get()Jingoo Han2013-07-111-4/+2
| * | watchdog: dw_wdt: Staticize local symbolSachin Kamat2013-07-111-2/+2
| * | watchdog: dw_wdt: use devm_clk_get()Jingoo Han2013-07-111-5/+2
| * | watchdog: ts72xx_wdt: use devm_*() functionsJingoo Han2013-07-111-57/+10
| * | watchdog: riowd: use platform_{get,set}_drvdata()Jingoo Han2013-07-111-2/+2
| * | watchdog: riowd: use devm_kzalloc()Jingoo Han2013-07-111-6/+2
| * | watchdog: rc32434_wdt: use devm_ioremap_nocache() functionsJingoo Han2013-07-111-7/+3
| * | watchdog: nuc900_wdt: use devm_*() functionsJingoo Han2013-07-111-39/+11
| * | watchdog: mv64x60_wdt: use devm_ioremap()Jingoo Han2013-07-111-3/+1
| * | watchdog: bcm63xx_wdt: use devm_ioremap_nocache()Jingoo Han2013-07-111-5/+4
| * | watchdog: at32ap700x: Remove redundant platform_set_drvdata()Sachin Kamat2013-07-111-4/+1
| * | watchdog: at32ap700x_wdt: use devm_*() functionsJingoo Han2013-07-111-8/+4
* | | Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2013-07-1369-786/+15734
|\ \ \
| | \ \
| | \ \
| | \ \
| | \ \
| *---. \ \ Merge branches 'mlx5', 'qib' and 'srp' into for-nextRoland Dreier2013-07-119-24/+189
| |\ \ \ \ \
| | | | * | | IB/srp: Let srp_abort() return FAST_IO_FAIL if TL offlineBart Van Assche2013-07-111-2/+1
| | | * | | | IB/qib: Log all SDMA errors unconditionallyDean Luick2013-07-113-1/+171