summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-armLinus Torvalds2015-04-141-1/+1
|\
| * Merge branch 'devel-stable' into for-nextRussell King2015-04-1434-81/+232
| |\
| * | ARM: 8321/1: asm-generic: introduce .text.fixup input sectionArd Biesheuvel2015-03-291-1/+1
* | | Merge tag 'pm+acpi-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2015-04-1413-34/+117
|\ \ \
| | \ \
| | \ \
| *-. \ \ Merge branches 'powercap' and 'pm-devfreq'Rafael J. Wysocki2015-04-141-1/+1
| |\ \ \ \
| | | * | | PM / devfreq: event: Add const keyword for devfreq_event_ops structureChanwoo Choi2015-03-301-1/+1
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge branches 'pm-sleep' and 'pm-domains'Rafael J. Wysocki2015-04-133-7/+16
| |\ \ \ \ \ \
| | | * | | | | PM / domains: factor out code to get the generic PM domain from a struct deviceRussell King2015-03-221-3/+3
| | | * | | | | driver core / PM: Add PM domain callbacks for device setup/cleanupRafael J. Wysocki2015-03-221-0/+8
| | * | | | | | Merge back earlier suspend/hibernate material for v4.1.Rafael J. Wysocki2015-04-101-4/+5
| | |\ \ \ \ \ \
| | | * | | | | | PM / sleep: add pm-trace support for suspending phaseZhonghui Fu2015-03-181-4/+5
| | | | |_|_|/ / | | | |/| | | |
| | | | | | | |
| | \ \ \ \ \ \
| *-. \ \ \ \ \ \ Merge branches 'pm-cpufreq' and 'pm-cpuidle'Rafael J. Wysocki2015-04-131-0/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge back earlier cpuidle material for v4.1.Rafael J. Wysocki2015-04-101-0/+2
| | |/| | | | | |
| | | * | | | | | ARM: cpuidle: Add a cpuidle ops structure to be used for DTDaniel Lezcano2015-03-241-0/+2
| * | | | | | | | Merge branch 'pnp'Rafael J. Wysocki2015-04-131-0/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | PNP: Add helper macro for pnp_register_driver boilerplatePeter Huewe2015-03-181-0/+12
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'device-properties'Rafael J. Wysocki2015-04-137-26/+85
| |\ \ \ \ \ \ \ \
| | * | | | | | | | device property: Introduce firmware node type for platform dataRafael J. Wysocki2015-04-032-0/+34
| | * | | | | | | | device property: Make it possible to use secondary firmware nodesRafael J. Wysocki2015-04-033-2/+6
| | * | | | | | | | ACPI: Introduce has_acpi_companion()Rafael J. Wysocki2015-03-161-0/+10
| | * | | | | | | | driver core / ACPI: Represent ACPI companions using fwnode_handleRafael J. Wysocki2015-03-167-26/+37
| | |/ / / / / / /
| | | | | | | | |
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| *---. \ \ \ \ \ \ \ Merge branches 'acpi-pm', 'acpi-enumeration' and 'acpi-sysfs'Rafael J. Wysocki2015-04-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | / / / | | | | | |_|_|/ / / | | | | |/| | | | |
| | | * / | | | | | ACPI: Add acpi_device_uid() for convenienceAdrian Hunter2015-03-181-0/+1
| | |/ / / / / / /
* | | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2015-04-142-24/+2
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge tag 'v4.0-rc7' into nextDmitry Torokhov2015-04-0718-96/+140
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Input: tc3589x - localize platform dataLinus Walleij2015-04-031-23/+0
| * | | | | | | | | Merge tag 'v4.0-rc5' into nextDmitry Torokhov2015-03-23524-4522/+12901
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Input: rename KEY_DIRECTION to KEY_ROTATE_DISPLAYStefan BrĂ¼ns2015-03-061-1/+2
* | | | | | | | | | Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2015-04-143-6/+56
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | i2c: davinci: use ICPFUNC to toggle I2C as gpio for bus recoveryGrygorii Strashko2015-04-101-0/+1
| * | | | | | | | | | i2c: change input parameter to i2c_adapter for prepare/unprepare_recoveryGrygorii Strashko2015-04-101-2/+2
| * | | | | | | | | | i2c: slave: rework the slave APIWolfram Sang2015-03-271-4/+4
| * | | | | | | | | | of: base: add function to get highest id of an alias stemWolfram Sang2015-03-181-0/+6
| * | | | | | | | | | Merge branch 'i2c/quirks' into i2c/for-4.1Wolfram Sang2015-03-141-0/+43
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | i2c: add quirk structure to describe adapter flawsWolfram Sang2015-03-131-0/+43
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
* | | | | | | | | | Merge tag 'vfio-v4.1-rc1' of git://github.com/awilliam/linux-vfioLinus Torvalds2015-04-143-0/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | vgaarb: Stub vga_set_legacy_decoding()Alex Williamson2015-04-071-0/+5
| * | | | | | | | | | vfio: Split virqfd into a separate module for vfio bus driversAlex Williamson2015-03-171-2/+0
| * | | | | | | | | | vfio: move eventfd support code for VFIO_PCI to a separate fileAntonios Motakis2015-03-161-0/+27
| * | | | | | | | | | vfio: amba: VFIO support for AMBA devicesAntonios Motakis2015-03-161-0/+1
| * | | | | | | | | | vfio: platform: probe to devices on the platform busAntonios Motakis2015-03-161-0/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge tag 'pinctrl-v4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/l...Linus Torvalds2015-04-144-0/+91
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pinctrl: Add support for PM8916 GPIO's and MPP'sIvan T. Ivanov2015-04-082-0/+19
| * | | | | | | | | | pinctrl: Add support for Meson8bCarlo Caione2015-04-071-0/+32
| * | | | | | | | | | pinctrl: mediatek: Add Pinctrl/GPIO driver for mt8135.Hongzhou Yang2015-03-181-0/+40
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge tag 'mfd-for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2015-04-1417-627/+1584
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mfd: sec: Fix RTC alarm interrupt number on S2MPS11Krzysztof Kozlowski2015-04-091-1/+1
| * | | | | | | | | | mfd: menelaus: Drop support for SW controller VCOREAaro Koskinen2015-03-301-1/+0
| * | | | | | | | | | mfd: menelaus: Delete omap_has_menelausAaro Koskinen2015-03-301-6/+0
| * | | | | | | | | | mfd: arizona: Correct type of gpio_defaultsCharles Keepax2015-03-301-1/+1