summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'v3.17-rc4' into perf/core, to pick up fixesIngo Molnar2014-09-0921-76/+178
|\
| * Merge tag 'pm+acpi-3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2014-09-072-2/+1
| |\
| | *-. Merge branches 'pm-sleep', 'powercap', 'pm-domains' and 'pm-cpufreq'Rafael J. Wysocki2014-09-051-1/+1
| | |\ \
| | | | * PM / domains: Make generic_pm_domain.name constGeert Uytterhoeven2014-09-031-1/+1
| | | |/
| | * / ACPI / scan: not cache _SUN value in struct acpi_device_pnpYasuaki Ishimatsu2014-09-031-1/+0
| | |/
| * | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2014-09-071-6/+1
| |\ \
| | * | nohz: Restore NMI safe local irq work for local nohz kickFrederic Weisbecker2014-09-041-6/+1
| | |/
| * | Merge tag 'for-linus-20140905' of git://git.infradead.org/linux-mtdLinus Torvalds2014-09-061-1/+1
| |\ \
| | * | mtd: nand: fix DocBook warnings on nand_sdr_timings docBoris BREZILLON2014-08-191-1/+1
| * | | Merge tag 'regulator-v3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2014-09-052-0/+3
| |\ \ \
| | | \ \
| | | \ \
| | *-. \ \ Merge remote-tracking branches 'regulator/fix/doc' and 'regulator/fix/tps6509...Mark Brown2014-09-052-0/+3
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | regulator: fix kernel-doc warnings in header filesRandy Dunlap2014-08-282-0/+3
| * | | | | Merge tag 'gpio-v3.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...Linus Torvalds2014-09-051-45/+60
| |\ \ \ \ \
| | * | | | | gpio: move varargs hack outside #ifdef GPIOLIBLinus Walleij2014-09-021-45/+60
| * | | | | | Merge tag 'sound-3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/t...Linus Torvalds2014-09-041-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'asoc/fix/core' into asoc-linusMark Brown2014-09-021-1/+1
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | ASoC: core: fix .info for SND_SOC_BYTES_TLVSubhransu S. Prusty2014-08-181-1/+1
| | | | |/ / / | | | |/| | |
| * | | | | | Merge tag 'for-f2fs-3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2014-09-031-3/+13
| |\ \ \ \ \ \
| | * | | | | | f2fs: use macro for code readabilityChao Yu2014-08-221-3/+10
| | * | | | | | f2fs: fix incorrect calculation with total/free inode numChao Yu2014-08-211-0/+3
| | | |/ / / / | | |/| | | |
| * | | | | | Revert "leds: convert blink timer to workqueue"Jiri Kosina2014-09-021-1/+2
| | |/ / / / | |/| | | |
| * | | | | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2014-08-311-2/+11
| |\ \ \ \ \
| | * | | | | mtd: nand: omap: Revert to using software ECC by defaultRoger Quadros2014-08-251-2/+11
| | | |/ / / | | |/| | |
| * | | | | Merge tag 'spi-v3.17-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2014-08-311-0/+7
| |\ \ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | *---. \ \ \ \ Merge remote-tracking branches 'spi/fix/au1550', 'spi/fix/davinci', 'spi/fix/...Mark Brown2014-08-301-0/+7
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | / / / | | | | |_|/ / / | | | |/| | | |
| | | | * | | | spi: Add missing kerneldoc bitsThierry Reding2014-08-131-0/+7
| | | | |/ / /
| * | | | | | Merge branch 'akpm' (fixes from Andrew Morton)Linus Torvalds2014-08-291-1/+1
| |\ \ \ \ \ \
| | * | | | | | xattr: fix check for simultaneous glibc header inclusionFilipe Brandenburger2014-08-291-1/+1
| * | | | | | | Merge tag 'usb-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gre...Linus Torvalds2014-08-291-0/+26
| |\ \ \ \ \ \ \
| | * | | | | | | usbip: move usbip kernel code out of stagingValentina Manea2014-08-251-0/+26
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2014-08-291-5/+25
| |\ \ \ \ \ \ \
| | * | | | | | | jbd2: fix descriptor block size handling errors with journal_csumDarrick J. Wong2014-08-281-5/+25
| | |/ / / / / /
| * | | | | | | Merge branch 'for-linus' of git://git.kernel.dk/linux-blockLinus Torvalds2014-08-291-4/+3
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | blk-mq: get rid of unused BLK_MQ_F_SHOULD_SORT flagJens Axboe2014-08-151-4/+3
| * | | | | | | dma-buf/fence: Fix one more kerneldoc warningThierry Reding2014-08-281-0/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge tag 'nfs-for-3.17-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2014-08-251-0/+1
| |\ \ \ \ \ \
| | * | | | | | nfs: don't sleep with inode lock in lock_and_join_requestsWeston Andros Adamson2014-08-221-0/+1
| * | | | | | | Merge tag 'trace-fixes-v3.17-rc1' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2014-08-251-3/+11
| |\ \ \ \ \ \ \
| | * | | | | | | ftrace: Allow ftrace_ops to use the hashes from other opsSteven Rostedt (Red Hat)2014-08-221-3/+11
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge tag 'gpio-v3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...Linus Torvalds2014-08-241-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | gpio: move GPIOD flags outside #ifdefLinus Walleij2014-08-211-2/+2
| | |/ / / / / /
| * | | | | | | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2014-08-242-0/+8
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | drm/radeon: add additional SI pci idsAlex Deucher2014-08-221-0/+4
| | * | | | | | drm/radeon: add new bonaire pci idsAlex Deucher2014-08-221-0/+2
| | * | | | | | drm/radeon: add new KV pci idAlex Deucher2014-08-221-0/+1
| | * | | | | | drm/radeon: properly document reloc priority maskChristian König2014-08-181-0/+1
| | |/ / / / /
* | | | | | | Merge branch 'rfc/perf' into perf/core, because it's ready for inclusionIngo Molnar2014-08-241-9/+8
|\ \ \ \ \ \ \
| * | | | | | | jump_label: Fix small typos in the documentationIngo Molnar2014-08-101-9/+8
* | | | | | | | Merge branch 'linus' into perf/core, to fix conflictsIngo Molnar2014-08-24444-3683/+12414
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-08-221-1/+0
| |\ \ \ \ \ \ \