History log of /openbmc/linux/tools/power/cpupower/utils/cpupower-set.c (Results 151 – 175 of 224)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 361128fc 17-Jan-2014 Rob Herring <robh@kernel.org>

Merge remote-tracking branch 'grant/devicetree/next' into for-3.14


# 81e53d04 17-Jan-2014 Mark Brown <broonie@linaro.org>

Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bpw


# 0d9d349d 16-Jan-2014 Daniel Vetter <daniel.vetter@ffwll.ch>

Merge commit origin/master into drm-intel-next

Conflicts are getting out of hand, and now we have to shuffle even
more in -next which was also shuffled in -fixes (the call for
drm_mode_config_reset

Merge commit origin/master into drm-intel-next

Conflicts are getting out of hand, and now we have to shuffle even
more in -next which was also shuffled in -fixes (the call for
drm_mode_config_reset needs to move yet again).

So do a proper backmerge. I wanted to wait with this for the 3.13
relaese, but alas let's just do this now.

Conflicts:
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_pm.c

Besides the conflict around the forcewake get/put (where we chaged the
called function in -fixes and added a new parameter in -next) code all
the current conflicts are of the adjacent lines changed type.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

show more ...


# 315fba80 16-Jan-2014 Takashi Iwai <tiwai@suse.de>

Merge tag 'asoc-v3.13-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.13

A few small fixes in drivers, nothing too remarkable here but all go

Merge tag 'asoc-v3.13-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.13

A few small fixes in drivers, nothing too remarkable here but all good
to have - mainly these are fixes for things that were introduced in the
last merge window but only just got useful testing.

show more ...


# 860fc2f2 16-Jan-2014 Ingo Molnar <mingo@kernel.org>

Merge branch 'perf/urgent' into perf/core

Pick up the latest fixes, refresh the development tree.

Signed-off-by: Ingo Molnar <mingo@kernel.org>


# 099c2e9e 14-Jan-2014 Kevin Hilman <khilman@linaro.org>

Merge tag 'omap-for-v3.14/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

From Tony Lindgren:
Some non-urgent fixes to enable

Merge tag 'omap-for-v3.14/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

From Tony Lindgren:
Some non-urgent fixes to enable am335x features, update documentation,
and to remove unnecessary double initialization for the GPMC code.

* tag 'omap-for-v3.14/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (238 commits)
ARM: OMAP2+: gpmc: Move legacy GPMC width setting
ARM: OMAP2+: gpmc: Introduce gpmc_set_legacy()
ARM: OMAP2+: gpmc: Move initialization outside the gpmc_t condition
ARM: OMAP2+: board-generic: update SoC compatibility strings
Documentation: dt: OMAP: explicitly state SoC compatible strings
ARM: OMAP2+: enable AM33xx SOC EVM audio
ARM: OMAP2+: Select USB PHY for AM335x SoC
+Linux 3.13-rc5

show more ...


# 13ea3300 14-Jan-2014 Mark Brown <broonie@linaro.org>

Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-rspi


# 56b48110 13-Jan-2014 Ingo Molnar <mingo@kernel.org>

Merge branch 'sched/urgent' into sched/core

Pick up the latest fixes before applying new changes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>


# 1c62448e 13-Jan-2014 Ingo Molnar <mingo@kernel.org>

Merge tag 'v3.13-rc8' into core/locking

Refresh the tree with the latest fixes, before applying new changes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>


# da454075 12-Jan-2014 Ingo Molnar <mingo@kernel.org>

Merge tag 'v3.13-rc8' into x86/ras, to pick up fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>


# dba86146 12-Jan-2014 Ingo Molnar <mingo@kernel.org>

Merge branch 'linus' into timers/core

Pick up the latest fixes and refresh the branch.

Signed-off-by: Ingo Molnar <mingo@kernel.org>


Revision tags: v3.13-rc8
# dde86f41 08-Jan-2014 Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Merge v3.13-rc6 into char-misc-next

We want these fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


# 54a387cb 08-Jan-2014 Jens Axboe <axboe@kernel.dk>

Merge branch 'for-3.14/core' into for-3.14/drivers

We need the updated code to make bcache easier to merge.


# 38fd2c20 06-Jan-2014 James Morris <james.l.morris@oracle.com>

Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM


# ef0b8b9a 05-Jan-2014 Ingo Molnar <mingo@kernel.org>

Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts

Conflicts:
arch/x86/platform/efi/efi.c
drivers/firmware/efi/Kconfig

Signed-off-by: Ingo Molnar <mingo@kernel.org>


# 0822069f 05-Jan-2014 Takashi Iwai <tiwai@suse.de>

Merge tag 'asoc-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v3.14

Not a lot going on framework wise, partly due to Christmas at least in
t

Merge tag 'asoc-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v3.14

Not a lot going on framework wise, partly due to Christmas at least in
the case of the work I've been doing, but there's been quite a lot of
cleanup activity going on and the usual trickle of new drivers:

- Update to the generic DMA code to support deferred probe and managed
resources.
- New drivers for BCM2835 (used in Raspberry Pi), Tegra with MAX98090
and Analog Devices AXI I2S and S/PDIF controller IPs.
- Device tree support for the simple card, max98090 and cs42l52.
- Conversion of the Samsung drivers to native dmaengine, making them
multiplatform compatible and hopefully helping keep them more modern
and up to date.
- More regmap conversions, including a very welcome one for twl6040
from Peter Ujfalusi.
- A big overhaul of the DaVinci drivers also from Peter Ujfalusi.

show more ...


Revision tags: v3.13-rc7
# b28bc9b3 31-Dec-2013 Jens Axboe <axboe@kernel.dk>

Merge tag 'v3.13-rc6' into for-3.14/core

Needed to bring blk-mq uptodate, since changes have been going in
since for-3.14/core was established.

Fixup merge issues related to the immutable biovec ch

Merge tag 'v3.13-rc6' into for-3.14/core

Needed to bring blk-mq uptodate, since changes have been going in
since for-3.14/core was established.

Fixup merge issues related to the immutable biovec changes.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Conflicts:
block/blk-flush.c
fs/btrfs/check-integrity.c
fs/btrfs/extent_io.c
fs/btrfs/scrub.c
fs/logfs/dev_bdev.c

show more ...


# 68066bb3 31-Dec-2013 Mark Brown <broonie@linaro.org>

Merge tag 'v3.13-rc6' into spi-dw

To resolve trivial overlaps with fixes.

Linux 3.13-rc6


# 68e67d97 30-Dec-2013 Mark Brown <broonie@linaro.org>

Merge tag 'v3.13-rc6' into spi-rcar

To resolve spurious merge conflicts with fixes.

Linux 3.13-rc6


Revision tags: v3.13-rc6
# fe5a365c 28-Dec-2013 Olof Johansson <olof@lixom.net>

Merge tag 'v3.13-rc5' into next/boards

Need a newer base version to get a regulator fix for Samsung platforms that
they enable building in a defconfig.

Linux 3.13-rc5


# 9b17c165 28-Dec-2013 Olof Johansson <olof@lixom.net>

Merge tag 'omap-for-v3.13/intc-ldp-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:
Fix a regression for wrong interrupt numbers for some device

Merge tag 'omap-for-v3.13/intc-ldp-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:
Fix a regression for wrong interrupt numbers for some devices after
the sparse IRQ conversion, fix DRA7 console output for earlyprintk,
and fix the LDP LCD backlight when DSS is built into the kernel and
not as a loadable module.

* tag 'omap-for-v3.13/intc-ldp-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Fix LCD panel backlight regression for LDP legacy booting
ARM: OMAP2+: hwmod_data: fix missing OMAP_INTC_START in irq data
ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL
+ v3.13-rc5

Signed-off-by: Olof Johansson <olof@lixom.net>

show more ...


# 99f14bd4 24-Dec-2013 Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Merge 3.13-rc5 into usb-next

This resolves the merge issue with drivers/usb/host/ohci-at91.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


# b86b75ec 24-Dec-2013 Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Merge 3.13-rc5 into tty-next

We need the tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


# 912cbd49 24-Dec-2013 Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Merge 3.13-rc5 into staging-next

This resolves a merge issue with drivers/staging/imx-drm/imx-drm-core.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


# 5bd2010f 24-Dec-2013 Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Merge 3.13-rc5 into staging-next

We want these fixes here to handle some merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


123456789