summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* clocksource: Fix 'ret' data type of sysfs_override_clocksource() and sysfs_un...Elad Wexler2013-09-171-2/+2
* Merge branch 'fortglx/3.12/time' into fortglx/3.13/timeJohn Stultz2013-09-163-5/+12
|\
| * ntp: Make periodic RTC update more reliableMiroslav Lichvar2013-08-221-1/+2
| * clocksource: Fix !CONFIG_CLOCKSOURCE_WATCHDOG compilePrarit Bhargava2013-07-221-0/+1
| * rtc: Keep system awake until all expired RTC timers are handledZoran Markovic2013-07-221-4/+9
* | Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/timeJohn Stultz2013-09-164-65/+95
|\ \
| * | sched_clock: Add support for >32 bit sched_clockStephen Boyd2013-07-302-14/+34
| * | sched_clock: Use an hrtimer instead of timerStephen Boyd2013-07-301-17/+21
| * | sched_clock: Use seqcount instead of rolling our ownStephen Boyd2013-07-301-19/+8
| * | clocksource: Extract max nsec calculation into separate functionStephen Boyd2013-07-302-15/+32
* | | Linux 3.12-rc1v3.12-rc1Linus Torvalds2013-09-161-3/+3
* | | Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/t...Linus Torvalds2013-09-168-128/+164
|\ \ \
| * | | clocksource: armada-370-xp: Add detailed clock requirements in devicetree bin...Ezequiel Garcia2013-09-021-2/+11
| * | | clocksource: armada-370-xp: Get reference fixed-clock by nameEzequiel Garcia2013-09-021-2/+5
| * | | clocksource: armada-370-xp: Replace WARN_ON with BUG_ONEzequiel Garcia2013-09-021-1/+1
| * | | clocksource: armada-370-xp: Fix device-tree bindingEzequiel Garcia2013-09-021-5/+22
| * | | clocksource: armada-370-xp: Introduce new compatiblesEzequiel Garcia2013-09-021-15/+39
| * | | clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLAREEzequiel Garcia2013-09-023-23/+5
| * | | clocksource: armada-370-xp: Simplify TIMER_CTRL register accessEzequiel Garcia2013-09-021-39/+30
| * | | clocksource: armada-370-xp: Use BIT()Ezequiel Garcia2013-09-021-6/+6
| * | | ARM: timer-sp: Set dynamic irq affinityViresh Kumar2013-08-221-1/+2
| * | | ARM: nomadik: add dynamic irq flag to the timerDaniel Lezcano2013-08-221-1/+2
| * | | clocksource: sh_cmt: 32-bit control register supportMagnus Damm2013-08-221-14/+36
| * | | clocksource: em_sti: Convert to devm_* managed helpersLaurent Pinchart2013-08-221-35/+14
* | | | Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6Linus Torvalds2013-09-162-36/+21
|\ \ \ \
| * | | | cifs: update cifs.txt and remove some outdated infosBjörn Jacke2013-09-131-31/+11
| * | | | cifs: Avoid calling unlock_page() twice in cifs_readpage() when using fscacheSachin Prabhu2013-09-131-3/+7
| * | | | cifs: Do not take a reference to the page in cifs_readpage_worker()Sachin Prabhu2013-09-131-2/+3
* | | | | Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubiLinus Torvalds2013-09-162-4/+4
|\ \ \ \ \
| * | | | | UBI: Fix invalidate_fastmap()Richard Weinberger2013-08-201-4/+1
| * | | | | UBI: Fix PEB leak in wear_leveling_worker()Richard Weinberger2013-08-191-0/+3
* | | | | | Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifsLinus Torvalds2013-09-161-3/+4
|\ \ \ \ \ \
| * | | | | | UBIFS: remove invalid warn msg with tst_recovery enabledMats Kärrman2013-08-161-3/+4
* | | | | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2013-09-157-8/+50
|\ \ \ \ \ \ \
| * | | | | | | MIPS: kernel: vpe: Make vpe_attrs an array of pointers.Markos Chandras2013-09-131-1/+1
| * | | | | | | MIPS: Fix SMP core calculations when using MT support.Leonid Yegoshin2013-09-131-2/+11
| * | | | | | | MIPS: DECstation I/O ASIC DMA interrupt handling fixMaciej W. Rozycki2013-09-133-0/+11
| * | | | | | | MIPS: DECstation HRT initialization rearrangementMaciej W. Rozycki2013-09-133-5/+27
* | | | | | | | Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86Linus Torvalds2013-09-1513-114/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | platform/x86: panasonic-laptop: reuse module_acpi_driverAndy Shevchenko2013-09-051-24/+1
| * | | | | | | | samsung-laptop: fix config build errorRandy Dunlap2013-09-051-0/+1
| * | | | | | | | platform: x86: remove unnecessary platform_set_drvdata()Jingoo Han2013-09-053-3/+0
| * | | | | | | | amilo-rfkill: Enable using amilo-rfkill with the FSC Amilo L1310.Jerome Meinke2013-09-051-0/+7
| * | | | | | | | wmi: parse_wdg() should return kernel error codesDan Carpenter2013-09-051-2/+2
| * | | | | | | | hp_wmi: Fix unregister order in hp_wmi_rfkill_setup()Kirill Tkhai2013-09-051-8/+8
| * | | | | | | | platform: replace strict_strto*() with kstrto*()Jingoo Han2013-09-052-3/+5
| * | | | | | | | x86: irst: use module_acpi_driver to simplify the codeWei Yongjun2013-09-051-12/+1
| * | | | | | | | x86: smartconnect: use module_acpi_driver to simplify the codeWei Yongjun2013-09-051-12/+1
| * | | | | | | | platform samsung-q10: use ACPI instead of direct EC callsFrederick van der Wyck2013-09-052-45/+22
| * | | | | | | | thinkpad_acpi: add the ability setting TPACPI_LED_NONE by quirkAdam Lee2013-09-051-3/+10