#
61767729 |
| 29-Jan-2013 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
Conflicts: drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are against newer code (mvneta).
|
#
7b5c4a65 |
| 26-Jan-2013 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge tag 'v3.8-rc5' into x86/mm
The __pa() fixup series that follows touches KVM code that is not present in the existing branch based on v3.7-rc5, so merge in the current upstream from Linus.
Sig
Merge tag 'v3.8-rc5' into x86/mm
The __pa() fixup series that follows touches KVM code that is not present in the existing branch based on v3.7-rc5, so merge in the current upstream from Linus.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
show more ...
|
Revision tags: v3.8-rc5 |
|
#
befddb21 |
| 24-Jan-2013 |
Ingo Molnar <mingo@kernel.org> |
Merge tag 'v3.8-rc4' into irq/core
Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
Revision tags: v3.8-rc4 |
|
#
734d1ece |
| 11-Jan-2013 |
Mauro Carvalho Chehab <mchehab@redhat.com> |
Merge tag 'v3.8-rc3' into v4l_for_linus
Linux 3.8-rc3
* tag 'v3.8-rc3': (11110 commits) Linux 3.8-rc3 mm: reinstante dropped pmd_trans_splitting() check cred: Remove tgcred pointer from struc
Merge tag 'v3.8-rc3' into v4l_for_linus
Linux 3.8-rc3
* tag 'v3.8-rc3': (11110 commits) Linux 3.8-rc3 mm: reinstante dropped pmd_trans_splitting() check cred: Remove tgcred pointer from struct cred drm/ttm: fix fence locking in ttm_buffer_object_transfer ARM: clps711x: Fix bad merge of clockevents setup ARM: highbank: save and restore L2 cache and GIC on suspend ARM: highbank: add a power request clear ARM: highbank: fix secondary boot and hotplug ARM: highbank: fix typos with hignbank in power request functions ARM: dts: fix highbank cpu mpidr values ARM: dts: add device_type prop to cpu nodes on Calxeda platforms drm/prime: drop reference on imported dma-buf come from gem xen/netfront: improve truesize tracking ARM: mx5: Fix MX53 flexcan2 clock ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array sctp: fix Kconfig bug in default cookie hmac selection EDAC: Cleanup device deregistering path EDAC: Fix EDAC Kconfig menu EDAC: Fix kernel panic on module unloading ALSA: hda - add mute LED for HP Pavilion 17 (Realtek codec) ...
show more ...
|
Revision tags: v3.8-rc3 |
|
#
cf9ce948 |
| 07-Jan-2013 |
James Morris <james.l.morris@oracle.com> |
Merge tag 'v3.8-rc2' into next
Sync to Linus' tree.
Linux 3.8-rc2
|
Revision tags: v3.8-rc2 |
|
#
a44dca17 |
| 27-Dec-2012 |
Mauro Carvalho Chehab <mchehab@redhat.com> |
Merge tag 'v3.8-rc1' into staging/for_v3.9
Linux 3.8-rc1
* tag 'v3.8-rc1': (10696 commits) Linux 3.8-rc1 Revert "nfsd: warn on odd reply state in nfsd_vfs_read" ARM: dts: fix duplicated build
Merge tag 'v3.8-rc1' into staging/for_v3.9
Linux 3.8-rc1
* tag 'v3.8-rc1': (10696 commits) Linux 3.8-rc1 Revert "nfsd: warn on odd reply state in nfsd_vfs_read" ARM: dts: fix duplicated build target and alphabetical sort out for exynos dm stripe: add WRITE SAME support dm: remove map_info dm snapshot: do not use map_context dm thin: dont use map_context dm raid1: dont use map_context dm flakey: dont use map_context dm raid1: rename read_record to bio_record dm: move target request nr to dm_target_io dm snapshot: use per_bio_data dm verity: use per_bio_data dm raid1: use per_bio_data dm: introduce per_bio_data dm kcopyd: add WRITE SAME support to dm_kcopyd_zero dm linear: add WRITE SAME support dm: add WRITE SAME support dm: prepare to support WRITE SAME dm ioctl: use kmalloc if possible ...
Conflicts: MAINTAINERS
show more ...
|
Revision tags: v3.8-rc1 |
|
#
8b0cab14 |
| 13-Dec-2012 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge tag 'regulator-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown: "A fairly quiet release again, a couple of relatively small new
Merge tag 'regulator-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown: "A fairly quiet release again, a couple of relatively small new features and a bunch of driver specific work including yet more code elimination and fixes from Axel Lin.
- Addidion of linear_min_sel for offsetting linear selectors in the helpers. - Support for continuous voltage ranges for regulators with extremely high resolution. - Drivers for AS3711, DA9055, MAX9873, TPS51632, TPS80031 and ARM vexpress."
Fix up trivial conflict (due to typo fix) in palmas-regulator.c
* tag 'regulator-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (80 commits) regulator: core: Fix logic to determinate if regulator can change voltage regulator: s5m8767: Fix to work even if no DVS gpio present regulator: s5m8767: Fix to read the first DVS register. regulator: s5m8767: Fix to work when platform registers less regulators regulator: gpio-regulator: gpio_set_value should use cansleep regulator: gpio-regulator: Fix logical error in for() loop regulator: anatop: Use regulator_[get|set]_voltage_sel_regmap regulator: anatop: Use linear_min_sel with linear mapping regulator: max1586: Implement get_voltage_sel callback regulator: lp8788-buck: Kill _gpio_request function regulator: tps80031: Convert tps80031_ldo_ops to linear_min_sel and list_voltage_linear regulator: lp8788-ldo: Remove val array in lp8788_config_ldo_enable_mode regulator: gpio-regulator: Add ifdef CONFIG_OF guard for regulator_gpio_of_match regulator: palmas: Convert palmas_ops_smps to regulator_[get|set]_voltage_sel_regmap regulator: palmas: Return raw register values as the selectors in [get|set]_voltage_sel regulators: add regulator_can_change_voltage() function regulator: tps51632: Ensure [base|max]_voltage_uV pdata settings are valid regulator: wm831x-dcdc: Add MODULE_ALIAS for wm831x-boostp regulator: wm831x-dcdc: Ensure selected voltage falls within requested range regulator: tps51632: Use linear_min_sel and regulator_[map|list]_voltage_linear ...
show more ...
|
#
818b930b |
| 12-Dec-2012 |
Jiri Kosina <jkosina@suse.cz> |
Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for-3.8/multitouch', 'for-3.8/roccat', 'for-3.8/sensors' and 'for-3.8/upstream' into for-linus
Conflicts: drivers/hid/
Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for-3.8/multitouch', 'for-3.8/roccat', 'for-3.8/sensors' and 'for-3.8/upstream' into for-linus
Conflicts: drivers/hid/hid-core.c
show more ...
|
Revision tags: v3.7 |
|
#
925f14dc |
| 10-Dec-2012 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge remote-tracking branch 'regulator/topic/wm831x' into regulator-next
|
#
1f9cc5f7 |
| 10-Dec-2012 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge remote-tracking branch 'regulator/topic/hotplug' into regulator-next
|
#
d9f16b6e |
| 10-Dec-2012 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge remote-tracking branch 'regulator/fix/wm831x' into regulator-next
|
Revision tags: v3.7-rc8 |
|
#
43f1f216 |
| 30-Nov-2012 |
Axel Lin <axel.lin@ingics.com> |
regulator: wm831x-dcdc: Add MODULE_ALIAS for wm831x-boostp
Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
|
#
1a679930 |
| 30-Nov-2012 |
Axel Lin <axel.lin@ingics.com> |
regulator: wm831x-dcdc: Ensure selected voltage falls within requested range
Use DIV_ROUND_UP to ensure selected voltage won't less than min_uV due to integer truncation.
Signed-off-by: Axel Lin <a
regulator: wm831x-dcdc: Ensure selected voltage falls within requested range
Use DIV_ROUND_UP to ensure selected voltage won't less than min_uV due to integer truncation.
Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
show more ...
|
#
b87d07b1 |
| 27-Nov-2012 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'topic/hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-max8997
Conflicts: drivers/regulator/max8997.c
|
Revision tags: v3.7-rc7 |
|
#
8dc995f5 |
| 19-Nov-2012 |
Bill Pemberton <wfp5p@virginia.edu> |
regulator: remove use of __devexit
CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Mark Brown <broonie@
regulator: remove use of __devexit
CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
show more ...
|
#
13ae633c |
| 20-Nov-2012 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
regulator: wm831x: Set the new rather than old value for DVS VSEL
Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stabl
regulator: wm831x: Set the new rather than old value for DVS VSEL
Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org
show more ...
|
#
a5023574 |
| 19-Nov-2012 |
Bill Pemberton <wfp5p@virginia.edu> |
regulator: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Mark Brown <broonie@
regulator: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
show more ...
|
#
5eb9f2b9 |
| 19-Nov-2012 |
Bill Pemberton <wfp5p@virginia.edu> |
regulator: remove use of __devexit_p
CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Mark Brown <broo
regulator: remove use of __devexit_p
CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
show more ...
|
Revision tags: v3.7-rc6, v3.7-rc5, v3.7-rc4 |
|
#
0588000e |
| 31-Oct-2012 |
Alexander Graf <agraf@suse.de> |
Merge commit 'origin/queue' into for-queue
Conflicts: arch/powerpc/include/asm/Kbuild arch/powerpc/include/uapi/asm/Kbuild
|
#
53279f36 |
| 30-Oct-2012 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
|
#
68fe0f0a |
| 30-Oct-2012 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changes
|
#
19bf7f8a |
| 29-Oct-2012 |
Marcelo Tosatti <mtosatti@redhat.com> |
Merge remote-tracking branch 'master' into queue
Merge reason: development work has dependency on kvm patches merged upstream.
Conflicts: arch/powerpc/include/asm/Kbuild arch/powerpc/include/asm/
Merge remote-tracking branch 'master' into queue
Merge reason: development work has dependency on kvm patches merged upstream.
Conflicts: arch/powerpc/include/asm/Kbuild arch/powerpc/include/asm/kvm_para.h
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
show more ...
|
Revision tags: v3.7-rc3 |
|
#
3bd7bf1f |
| 28-Oct-2012 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
Sync up with Linus' tree to be able to apply Cesar's patch against newer version of the code.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
|
#
ef8c029f |
| 24-Oct-2012 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'perf/urgent' into perf/core
Pick up v3.7-rc2 and fixes before applying more patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
c2fb7916 |
| 22-Oct-2012 |
Daniel Vetter <daniel.vetter@ffwll.ch> |
Merge tag 'v3.7-rc2' into drm-intel-next-queued
Linux 3.7-rc2
Backmerge to solve two ugly conflicts: - uapi. We've already added new ioctl definitions for -next. Do I need to say more? - wc support
Merge tag 'v3.7-rc2' into drm-intel-next-queued
Linux 3.7-rc2
Backmerge to solve two ugly conflicts: - uapi. We've already added new ioctl definitions for -next. Do I need to say more? - wc support gtt ptes. We've had to revert this for snb+ for 3.7 and also fix a few other things in the code. Now we know how to make it work on snb+, but to avoid losing the other fixes do the backmerge first before re-enabling wc gtt ptes on snb+.
And a few other minor things, among them git getting confused in intel_dp.c and seemingly causing a conflict out of nothing ...
Conflicts: drivers/gpu/drm/i915/i915_reg.h drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_dp.c drivers/gpu/drm/i915/intel_modes.c include/drm/i915_drm.h
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
show more ...
|