summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/l...Linus Torvalds2015-09-1144-197/+509
|\
| *-. Merge branches 'thermal-core' and 'thermal-intel' of .git into nextZhang Rui2015-09-0244-197/+509
| |\ \
| | | * thermal: Add Intel PCH thermal driverTushar Dave2015-08-043-0/+295
| | | * thermal/powerclamp: add cpu id for denlow platformJacob Pan2015-08-031-0/+1
| | | * thermal/powerclamp: add cpu id for Skylake u/yRadivoje Jovanovic2015-08-031-0/+1
| | | * thermal/powerclamp: add cpu id for skylake h/sRadivoje Jovanovic2015-08-031-0/+1
| | * | thermal: Add comment explaining test for critical temperatureSascha Hauer2015-08-031-0/+5
| | * | thermal: Use IS_ENABLED instead of #ifdefSascha Hauer2015-08-031-26/+19
| | * | thermal: remove unnecessary call to thermal_zone_device_set_pollingSascha Hauer2015-08-031-3/+0
| | * | thermal: trivial: fix typo in commentSascha Hauer2015-08-031-1/+1
| | * | thermal: consistently use int for temperaturesSascha Hauer2015-08-0339-167/+152
| | * | thermal: add available policies sysfs attributeNi Wade2015-08-032-0/+34
| | |/
* | | Merge git://www.linux-watchdog.org/linux-watchdogLinus Torvalds2015-09-1153-135/+916
|\ \ \
| * | | Watchdog: Fix parent of watchdog_devicesPratyush Anand2015-09-0937-0/+37
| * | | watchdog: at91rm9200: Correct check for syscon_node_to_regmap() errorsBjorn Andersson2015-09-091-1/+1
| * | | watchdog: at91sam9: get and use slow clockAlexandre Belloni2015-09-091-2/+20
| * | | Documentation: dt: binding: atmel-sama5d4-wdt: for SAMA5D4 watchdog driverWenyou Yang2015-09-091-0/+35
| * | | watchdog: add a driver to support SAMA5D4 watchdog timerWenyou Yang2015-09-094-0/+292
| * | | watchdog: mpc8xxx: allow to compile for MPC512xUwe Kleine-König2015-09-091-1/+1
| * | | watchdog: mpc8xxx: use better error code when watchdog cannot be enabledUwe Kleine-König2015-09-091-1/+1
| * | | watchdog: mpc8xxx: use dynamic memory for device specific dataUwe Kleine-König2015-09-091-35/+53
| * | | watchdog: mpc8xxx: use devm_ioremap_resource to map memoryUwe Kleine-König2015-09-091-12/+7
| * | | watchdog: mpc8xxx: make use of of_device_get_match_dataUwe Kleine-König2015-09-091-4/+2
| * | | watchdog: mpc8xxx: simplify registrationUwe Kleine-König2015-09-091-31/+7
| * | | watchdog: mpc8xxx: remove dead codeUwe Kleine-König2015-09-091-13/+2
| * | | watchdog: lpc18xx_wdt_get_timeleft() can be staticFengguang Wu2015-09-091-1/+1
| * | | DT: watchdog: Add NXP LPC18xx Watchdog Timer binding documentationAriel D'Alessandro2015-09-091-0/+19
| * | | watchdog: NXP LPC18xx Watchdog Timer DriverAriel D'Alessandro2015-09-093-0/+352
| * | | watchdog: gpio-wdt: ping already at startup for always running devicesUwe Kleine-König2015-09-091-30/+30
| * | | watchdog: gpio-wdt: be more strict about hw_algo matchingUwe Kleine-König2015-09-091-2/+2
| * | | Documentation: watchdog: at91sam9_wdt: add clocks propertyAlexandre Belloni2015-09-091-0/+2
| * | | watchdog: booke_wdt: Use infrastructure to check timeout limitsGuenter Roeck2015-09-091-3/+1
| * | | watchdog: (nv_tco) add support for MCP79Vivien Didelot2015-09-091-0/+2
| * | | watchdog: sunxi: fix activation of system resetFrancesco Lavra2015-09-091-1/+1
| * | | watchdog: mtk_wdt: add wdt shutdown callback to disable wdt if enabledGreta Zhang2015-09-091-0/+9
| * | | watchdog: mtk_wdt: add suspend/resume supportGreta Zhang2015-09-091-0/+30
| * | | watchdog: imgpdc: Unregister restart handler on removeEzequiel Garcia2015-09-091-0/+1
| * | | Documentation/watchdog: add timeout and ping rate control to watchdog-test.cTimur Tabi2015-09-091-5/+17
* | | | Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2015-09-119-96/+82
|\ \ \ \
| * | | | Btrfs: cleanup: remove unnecessary check before btrfs_free_path is calledTsutomu Itoh2015-08-313-6/+3
| * | | | btrfs: async_thread: Fix workqueue 'max_active' value when initializingQu Wenruo2015-08-312-24/+35
| * | | | btrfs: Add raid56 support for updatingZhao Lei2015-08-313-39/+30
| * | | | btrfs: Cleanup for btrfs_calc_num_tolerated_disk_barrier_failuresZhao Lei2015-08-311-40/+33
| * | | | btrfs: Remove noused chunk_tree and chunk_objectid from scrub_enumerate_chunk...Zhao Lei2015-08-311-8/+2
| * | | | btrfs: Update out-of-date "skip parity stripe" commentZhao Lei2015-08-311-1/+1
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2015-09-1117-98/+191
|\ \ \ \ \
| * | | | | ceph: improve readahead for file holesYan, Zheng2015-09-091-1/+1
| * | | | | ceph: get inode size for each append writeYan, Zheng2015-09-091-0/+6
| * | | | | libceph: check data_len in ->alloc_msg()Ilya Dryomov2015-09-092-40/+18
| * | | | | libceph: use keepalive2 to verify the mon session is aliveYan, Zheng2015-09-086-14/+93