summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'pwm/for-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2016-05-2522-210/+585
|\
| * Merge branch 'for-4.7/pwm-atomic' into for-nextThierry Reding2016-05-1722-213/+580
| |\
| | * pwm: Add information about polarity, duty cycle and period to debugfsHeiko Stübner2016-05-171-0/+5
| | * pwm: Switch to the atomic APIBoris Brezillon2016-05-172-12/+41
| | * pwm: Update documentationBoris Brezillon2016-05-171-2/+28
| | * pwm: Add core infrastructure to allow atomic updatesBoris Brezillon2016-05-172-153/+303
| | * pwm: Add hardware readout infrastructureBoris Brezillon2016-05-172-0/+31
| | * pwm: Move the enabled/disabled info into pwm_stateBoris Brezillon2016-05-172-7/+17
| | * pwm: Introduce the pwm_state conceptBoris Brezillon2016-05-172-16/+46
| | * pwm: Keep PWM state in sync with hardware stateBoris Brezillon2016-05-172-15/+0
| | * ARM: Explicitly apply PWM config extracted from pwm_argsBoris Brezillon2016-05-171-0/+6
| | * drm: i915: Explicitly apply PWM config extracted from pwm_argsBoris Brezillon2016-05-171-0/+6
| | * input: misc: pwm-beeper: Explicitly apply PWM config extracted from pwm_argsBoris Brezillon2016-05-171-0/+6
| | * input: misc: max8997: Explicitly apply PWM config extracted from pwm_argsBoris Brezillon2016-05-171-0/+6
| | * backlight: lm3630a: explicitly apply PWM config extracted from pwm_argsBoris Brezillon2016-05-171-0/+6
| | * backlight: lp855x: Explicitly apply PWM config extracted from pwm_argsBoris Brezillon2016-05-171-0/+6
| | * backlight: lp8788: Explicitly apply PWM config extracted from pwm_argsBoris Brezillon2016-05-171-0/+6
| | * backlight: pwm_bl: Use pwm_get_args() where appropriateBoris Brezillon2016-05-171-1/+9
| | * fbdev: ssd1307fb: Use pwm_get_args() where appropriateBoris Brezillon2016-05-171-1/+10
| | * regulator: pwm: Use pwm_get_args() where appropriateBoris Brezillon2016-05-171-6/+14
| | * leds: pwm: Use pwm_get_args() where appropriateBoris Brezillon2016-05-171-1/+10
| | * input: misc: max77693: Use pwm_get_args() where appropriateBoris Brezillon2016-05-171-3/+14
| | * hwmon: pwm-fan: Use pwm_get_args() where appropriateBoris Brezillon2016-05-171-6/+20
| | * clk: pwm: Use pwm_get_args() where appropriateBoris Brezillon2016-05-171-5/+12
| | * pwm: Use pwm_get/set_xxx() helpers where appropriateBoris Brezillon2016-05-174-4/+5
| | * pwm: Get rid of pwm->lockBoris BREZILLON2016-05-173-21/+24
| | * backlight: lm3630a_bl: Stop messing with the pwm->period fieldBoris BREZILLON2016-05-171-2/+1
| | * backlight: pwm_bl: Remove useless call to pwm_set_period()Boris BREZILLON2016-05-171-3/+1
| | * pwm: rcar: Make use of pwm_is_enabled()Boris BREZILLON2016-05-171-1/+1
| | * Merge branch 'for-4.7/pwm-args' into for-4.7/pwm-atomicThierry Reding2016-05-174-8/+55
| | |\
| * | \ Merge branch 'for-4.7/pwm-regulator' into for-nextThierry Reding2016-05-171-6/+14
| |\ \ \
| * \ \ \ Merge branch 'for-4.7/pwm-args' into for-nextThierry Reding2016-05-174-8/+55
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | pwm: Fix pwm_apply_args() call sitesBoris Brezillon2016-05-171-10/+17
| * | | | Merge branch 'for-4.7/pwm-cleanup' into for-nextThierry Reding2016-05-171-1/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | pwm: Use kcalloc() instead of kzalloc()Thierry Reding2016-05-031-1/+1
| | * | | pwm: Add missing newlineThierry Reding2016-05-031-0/+1
| |/ / /
* | | | Merge git://www.linux-watchdog.org/linux-watchdogLinus Torvalds2016-05-2519-54/+349
|\ \ \ \
| * | | | MAINTAINERS: Add file patterns for watchdog device tree bindingsGeert Uytterhoeven2016-05-231-0/+1
| * | | | Documentation: Add ebc-c384_wdt watchdog-parameters.txt entryWilliam Breathitt Gray2016-05-141-0/+4
| * | | | watchdog: shwdt: Use setup_timer()Muhammad Falak R Wani2016-05-141-3/+1
| * | | | watchdog: cpwd: Use setup_timer()Muhammad Falak R Wani2016-05-141-3/+1
| * | | | arm64: defconfig: enable Renesas Watchdog TimerWolfram Sang2016-05-141-0/+2
| * | | | watchdog: renesas-wdt: add driverWolfram Sang2016-05-144-0/+247
| * | | | watchdog: remove error message when unable to allocate watchdog deviceColin Ian King2016-05-141-3/+1
| * | | | watchdog: f71808e_wdt: Fix WDTMOUT_STS register readKnud Poulsen2016-05-141-2/+2
| * | | | watchdog: f71808e_wdt: Fix typoKnud Poulsen2016-05-141-1/+1
| * | | | watchdog: f71808e_wdt: Add F81865 supportKnud Poulsen2016-05-141-3/+21
| * | | | watchdog: sp5100_tco: properly check for new register layoutsLucas Stach2016-05-141-5/+10
| * | | | watchdog: core: Fix circular locking dependencyGuenter Roeck2016-05-141-1/+0
| * | | | watchdog: core: fix trivial typo in a commentWolfram Sang2016-05-141-1/+1