Commit Graph

2275 Commits

Author SHA1 Message Date
Adam Williamson bb5d04d2ed Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel into baytrail 2014-09-23 07:50:48 -07:00
Josh Boyer 9dcf78723c Add patch to fix XPS 13 touchpad issue (rhbz 1123584) 2014-09-23 10:43:33 -04:00
Josh Boyer f1140bd02a Linux v3.17-rc6-125-gf3670394c29f 2014-09-23 10:20:20 -04:00
Josh Boyer f4cf24d458 Linux v3.17-rc6
- Revert EFI GOT fixes as it causes boot failures
- Disable debugging options.
2014-09-22 16:08:53 -04:00
Adam Williamson 5ddbd85a50 Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel into baytrail 2014-09-22 08:59:04 -07:00
Josh Boyer daec5ad199 Linux v3.17-rc5-105-g598a0c7d0932 2014-09-19 15:39:14 -04:00
Josh Boyer fe33fe1055 Disable NO_HZ_FULL again
- Enable early microcode loading (rhbz 1083716)
2014-09-19 14:40:35 -04:00
Josh Boyer 7c202583fc Linux v3.17-rc5-63-gd9773ceabfaf
- Enable infiniband on s390x
2014-09-19 12:40:32 -04:00
Josh Boyer bface6d723 Linux v3.17-rc5-25-g8ba4caf1ee15 2014-09-18 15:04:06 -04:00
Kyle McMartin 3836faf6e6 re-enable RCU_FAST_NO_HZ, enable NO_HZ_FULL on x86_64
- I also like to live dangerously. (Re-enable RCU_FAST_NO_HZ which has been off
  since April 2012. Also enable NO_HZ_FULL on x86_64.)
- I added zipped modules ages ago, remove it from TODO.
2014-09-17 13:10:12 -05:00
Josh Boyer dd6c13b6b2 Linux v3.17-rc5-24-g37504a3be90b
- Fix vmwgfx header include (rhbz 1138759)
2014-09-17 09:48:32 -04:00
Adam Williamson d1f086f672 Merge branch 'master' into baytrail 2014-09-16 20:41:56 -07:00
Josh Boyer cf23086f03 Linux v3.17-rc5-13-g2324067fa9a4
- Reenable debugging options.
2014-09-16 09:07:16 -04:00
Josh Boyer 7094b06a73 Linux v3.17-rc5
- Disable debugging options.
2014-09-15 11:10:34 -04:00
Adam Williamson 189cc86289 add UEFI boot fixes from mfleming's 'urgent' branch (BKO #84241) 2014-09-13 11:27:40 -07:00
Adam Williamson 2f81b0e16d drop the baytrail SDIO quirk patch which seems unneeded 2014-09-13 11:20:20 -07:00
Adam Williamson c30210e69f drop patches merged in 3.17 2014-09-13 11:00:10 -07:00
Adam Williamson a18b584961 Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel into baytrail
3.17 merge.

Conflicts:
	Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
	config-armv7
	config-armv7-generic
	config-armv7-lpae
	config-nodebug
	kernel-arm64.patch
	kernel.spec
	secure-modules.patch
	sources
2014-09-13 10:52:15 -07:00
Josh Boyer 9d990eb716 Linux v3.17-rc4-244-g5874cfed0b04 2014-09-12 13:26:54 -04:00
Josh Boyer 4ef2bf546a Enable ACPI_I2C_OPREGION 2014-09-11 15:16:35 -04:00
Josh Boyer 34af6ad39a Linux v3.17-rc4-168-g7ec62d421bdf
- Add support for touchpad in Asus X450 and X550 (rhbz 1110011)
2014-09-11 09:04:00 -04:00
Josh Boyer 3252fbd882 Linux v3.17-rc4-158-ge874a5fe3efa
- Add patch to fix oops on keyring gc (rhbz 1116347)
2014-09-10 09:55:35 -04:00
Adam Williamson 0e84f13bb3 attempt to support Venue 8 Pro wireless (ath6kl backport + add ID)
Backport the latest significant changes from ath6kl in 3.17, and
add the SDIO ID of the V8P's wireless adapter. This should possibly
make wireless work on the V8P.
2014-09-09 17:30:51 -07:00
Adam Williamson 28e375d8b0 update name of baytrail audio firmware file 2014-09-09 17:30:19 -07:00
Adam Williamson 8a5770dc47 Merge branch 'f21' into baytrail 2014-09-09 16:33:20 -07:00
Josh Boyer 4a609d3051 Linux v3.17-rc4-140-g8c68face5548
- Reenable debugging options.
2014-09-09 09:22:23 -04:00
Josh Boyer 9a6acd5add Remove ppc32 support
The powerpc secondary arch team has disabled all ppc32 builds in koji for
F21 and beyond:

https://lists.fedoraproject.org/pipermail/ppc/2014-May/002801.html

FESCo also recently said that dropped or new architectures must essentially
prove they have an active and viable effort behind them before being
considered for Secondary Arch support.  This effort has not materialized in
the interim since the current powerpc team dropped ppc32.

There's little point in keeping support for ppc32 support in the kernel
package when it will never be built.  This also removes the -smp variant
and with_smp* support, as that was only used on ppc32.
2014-09-08 14:43:02 -04:00
Peter Robinson a3f68e4d7b Build tools on ppc64le (rhbz 1138884), Some minor ppc64 cleanups 2014-09-08 19:31:10 +01:00
Peter Robinson 964596a34c Build tools on ppc64le (rhbz 1138884), Some minor ppc64 cleanups 2014-09-08 17:44:41 +01:00
Josh Boyer 8382f77e81 Linux v3.17-rc4
- Disable debugging options.
2014-09-08 08:19:57 -04:00
Josh Boyer db4d0648e2 Linux v3.16.2 2014-09-05 22:28:29 -04:00
Josh Boyer 39c21e4f5d Linux v3.17-rc3-94-gb7fece1be8b1 2014-09-05 10:18:34 -04:00
Josh Boyer 70fa09981c Linux v3.17-rc3-63-g44bf091f5089
- Enable kexec bzImage signature verification (from Vivek Goyal)
- Add support for Wacom Cintiq Companion from Benjamin Tissoires (rhbz 1134969)
2014-09-04 09:34:41 -04:00
Josh Boyer 52fafd4758 Add support for Wacom Cintiq Companion from Benjamin Tissoires (rhbz 1134969) 2014-09-04 08:47:53 -04:00
Josh Boyer 0806fade32 Linux v3.17-rc3-16-g955837d8f50e
- Reenable debugging options.
2014-09-03 15:29:26 -04:00
Josh Boyer 88954ba364 Remove with_extra switch
The with_extra switch was originally added with the addition of the
modules-extra subpackage.  However, it never really worked.  If you build
with it disabled, the subpackage is omitted but the modules that would be
included in it would still be built.  That can lead to errors further in the
build when we're moving things around in the -core and -modules subpackages.

Since it doesn't actually save build time at all, and it leads to build
failures for no real gain, drop it.
2014-09-02 13:01:06 -04:00
Josh Boyer 219cc0ba42 Remove with_extra switch
The with_extra switch was originally added with the addition of the
modules-extra subpackage.  However, it never really worked.  If you build
with it disabled, the subpackage is omitted but the modules that would be
included in it would still be built.  That can lead to errors further in the
build when we're moving things around in the -core and -modules subpackages.

Since it doesn't actually save build time at all, and it leads to build
failures for no real gain, drop it.
2014-09-02 12:42:58 -04:00
Josh Boyer 27d7c4756a Linux v3.17-rc3
- Disable debugging options.
2014-09-01 10:27:14 -04:00
Josh Boyer 4b72251382 Linux v3.17-rc2-89-g59753a805499 2014-08-29 09:19:32 -04:00
Josh Boyer 02f15284fb Fix NFSv3 ACL regression (rhbz 1132786) 2014-08-28 14:57:59 -04:00
Josh Boyer c8610754fd Fix NFSv3 ACL regression (rhbz 1132786) 2014-08-28 14:56:54 -04:00
Josh Boyer 0de60bed72 Don't enable CONFIG_DEBUG_WW_MUTEX_SLOWPATH (rhbz 1114160) 2014-08-28 10:38:28 -04:00
Josh Boyer 760806ab8a Linux v3.17-rc2-42-gf1bd473f95e0
- Don't enable CONFIG_DEBUG_WW_MUTEX_SLOWPATH (rhbz 1114160)
2014-08-28 10:35:19 -04:00
Justin M. Forbes 0d360df2cd CVE-2014-{5471,5472} isofs: Fix unbounded recursion when processing relocated directories 2014-08-27 20:32:54 -04:00
Josh Boyer a3696887c0 Disable streams on via XHCI (rhbz 1132666) 2014-08-27 09:26:18 -04:00
Josh Boyer ab9570130f Disable streams on via XHCI (rhbz 1132666) 2014-08-27 08:15:30 -04:00
Josh Boyer 79bc7c25df Linux v3.17-rc2-9-g68e370289c29
- Reenable debugging options.
2014-08-27 08:11:48 -04:00
Peter Robinson 515ee0712a - Minor generic ARMv7 updates
- Build tegra on both LPAE and general ARMv7 kernels (thank srwarren RHBZ 1110963)
- Set CMA to 64mb on LPAE kernel (RHBZ 1127000)
2014-08-26 21:22:24 +01:00
Peter Robinson a806b7f09f Minor tegra updates due to incorrect nvidia kernel config options 2014-08-26 16:29:38 +01:00
Josh Boyer dbc4098dbc Linux v3.17-rc2
- Fixup ARM MFD options after I2C=y change
- Disable debugging options.
2014-08-26 10:11:52 -04:00
Peter Robinson 96dba40a77 fix date in changelog 2014-08-26 12:04:21 +01:00
Peter Robinson 6bebad469b Minor generic ARMv7 updates, Build tegra on both LPAE and general ARMv7 kernels (thank srwarren RHBZ 1110963), Set CMA to 64mb on LPAE kernel (RHBZ 1127000) 2014-08-26 11:08:07 +01:00
Adam Williamson 21e24125a9 Merge branch 'f21' into baytrail
Conflicts:
	kernel-arm64.patch
	kernel.spec
	sources
2014-08-25 09:48:26 -07:00
Josh Boyer efcd02beae Linux v3.17-rc1-231-g7be141d05549
- Add patch to fix NFS oops on /proc removal (rhbz 1132368)
2014-08-25 10:33:49 -04:00
Josh Boyer c7df1977f2 Bump for build 2014-08-25 08:45:15 -04:00
Josh Boyer 80bc74d4ce Drop userns revert patch (rhbz 917708) 2014-08-22 13:22:21 -04:00
Josh Boyer e1ff27a3ca Drop userns revert patch (rhbz 917708) 2014-08-22 13:20:49 -04:00
Josh Boyer cc594c1f09 Linux v3.17-rc1-99-g5317821c0853 2014-08-22 12:08:11 -04:00
Josh Boyer 3644cb387d Linux v3.17-rc1-51-g372b1dbdd1fb 2014-08-21 09:24:32 -04:00
Josh Boyer 03d9d91f73 Drop serial-460800.patch
Nobody knows why we're still carrying it.  It isn't widely used.
2014-08-20 15:10:07 -04:00
Josh Boyer 6a91557e4c Patch file cleanup
Do a couple things here:

- Split the mega-patches into individual patches.  Should help with rebasing.
- Make all patches 'git am' acceptable.

There should be no functional or actual code differences from before
2014-08-20 13:22:24 -04:00
Josh Boyer a99be7d4cf Drop serial-460800.patch
Nobody knows why we're still carrying it.  It isn't widely used.
2014-08-20 12:35:12 -04:00
Josh Boyer 65a08efa4c Linux v3.17-rc1-22-g480cadc2b7e0
- Reenable debugging options.
2014-08-20 09:46:55 -04:00
Josh Boyer b5b8ababdc Drop radeon ppc patch
Replaced by ea31bf697d27270188a93cd78cf9de4bc968aca3 upstream
2014-08-19 13:25:42 -04:00
Josh Boyer c75e8208aa Drop radeon ppc patch
Replaced by ea31bf697d27270188a93cd78cf9de4bc968aca3 upstream
2014-08-19 13:23:09 -04:00
Josh Boyer e11f9a94c5 Fix NFSv3 oops (rhbz 1131551) 2014-08-19 12:10:55 -04:00
Josh Boyer e85b468696 Linux v3.17-rc1
- Disable debugging options.
- Fix CONFIG_SPI_DEBUG settings
2014-08-18 10:39:33 -04:00
Josh Boyer 24a429b4e9 Linux v3.16-11452-g88ec63d6f85c 2014-08-16 09:26:45 -04:00
Josh Boyer 593ea10443 Linux v3.16-11383-gc9d26423e56c 2014-08-15 08:51:23 -04:00
Peter Robinson d7bf642034 - ARM updates for 3.16
- Cleanup some old removed options
- Disable legacy USB OTG (using new configfs equivilents)
- Upstream patch to fix display on qemu (VExpress A9)
2014-08-15 13:26:22 +01:00
Kyle McMartin 904876094c kernel-arm64: resynch with git head (no functional change) 2014-08-14 11:03:39 -04:00
Josh Boyer 1c39e37061 Linux v3.16.1 2014-08-14 10:45:17 -04:00
Josh Boyer c2ffd34e66 Linux v3.16-10959-gf0094b28f303 2014-08-14 10:11:49 -04:00
Hans de Goede c6806e8bc5 Blacklist usb bulk streams on Etron EJ168 xhci controllers (rhbz#1121288)
- UAS: Limit max number of requests over USB-2 to 32 (rhbz#1128472)
2014-08-14 15:20:12 +02:00
Josh Boyer 14c8baad8d CVE-2014-{5206,5207} ro bind mount bypass with namespaces (rhbz 1129662 1129669) 2014-08-13 09:11:01 -04:00
Peter Robinson a412315350 - 3.17 ARMv7 updates
- Cleanup some old removed options
- Disable legacy USB OTG (using new configfs equivilents)
2014-08-13 07:41:01 +01:00
Kyle McMartin 574fd2c300 tag for build 2014-08-12 17:18:06 -04:00
Kyle McMartin 0c88b0b7fb nouveau_platform-fix.patch: handle nouveau_dev() removal
(also fix previous patch... sigh.)
2014-08-12 16:31:08 -04:00
Kyle McMartin 1fd75f556a tegra-powergate-header-move.patch: deal with armv7hl breakage 2014-08-12 15:29:34 -04:00
Josh Boyer 980c60263e Add updated crash driver from Dave Anderson and re-enable 2014-08-12 12:09:11 -04:00
Kyle McMartin 5da751d082 kernel-arm64.patch: fix up merge conflict and re-enable 2014-08-12 11:18:04 -04:00
Josh Boyer 39f3a276ce Linux v3.16-10473-gc8d6637d0497 2014-08-12 10:38:09 -04:00
Josh Boyer 11270026d6 Bump baserelease to 300
Do this now before I forget next time.
2014-08-11 11:56:18 -04:00
Josh Boyer 531b0ea5a0 Linux v3.16-10013-gc309bfa9b481
- Temporarily don't apply crash driver patch
2014-08-10 13:41:58 -04:00
Josh Boyer 3f7b3ae795 Linux v3.16-7503-g33caee39925b 2014-08-08 08:47:17 -04:00
Kyle McMartin d2b85a675d kernel-arm64.patch: fix up merge conflict and re-enable 2014-08-05 10:24:31 -04:00
Josh Boyer 7de7a7f141 Linux v3.16-3652-gf19107379dbc
- Reenable debugging options.
2014-08-05 06:44:35 -04:00
Josh Boyer 9c9c16627d Linux v3.16
- Disable debugging options.
2014-08-04 05:32:27 -04:00
Josh Boyer 146b953539 Linux v3.16
- Disable debugging options.
2014-08-04 05:32:12 -04:00
Peter Robinson 82ae65d1d8 Minor config updates for Armada and Sunxi ARM devices 2014-08-03 21:12:45 +01:00
Peter Robinson b958f0c6de Minor config updates for Armada and Sunxi ARM devices 2014-08-03 21:11:26 +01:00
Josh Boyer 8e011f011e Linux v3.16-rc7-84-g6f0928036bcb 2014-08-01 08:40:25 -04:00
Josh Boyer 3b18c1496e Linux v3.16-rc7-84-g6f0928036bcb 2014-08-01 08:40:17 -04:00
Josh Boyer 0432d120d5 Linux v3.16-rc7-76-g3a1122d26c62 2014-07-31 10:53:40 -04:00
Josh Boyer 73f882b7bf Linux v3.16-rc7-76-g3a1122d26c62 2014-07-31 10:53:23 -04:00
Kyle McMartin 3a3d323ba8 kernel-arm64.patch: fix up merge conflict and re-enable 2014-07-30 17:21:00 -04:00
Kyle McMartin e59c072994 kernel-arm64.patch: fix up merge conflict and re-enable 2014-07-30 17:20:17 -04:00
Josh Boyer d144328147 Linux v3.16-rc7-64-g26bcd8b72563
- Temporarily disable aarch64patches
2014-07-30 13:50:08 -04:00
Josh Boyer ecaa91af8b Linux v3.16-rc7-64-g26bcd8b72563
- Temporarily disable aarch64patches
2014-07-30 13:49:14 -04:00
Josh Boyer 74a17995ec Apply different patch from Milan Broz to fix LUKS partitions (rhbz 1115120) 2014-07-30 11:22:18 -04:00
Josh Boyer 082b8c8ad3 Apply different patch from Milan Broz to fix LUKS partitions (rhbz 1115120) 2014-07-30 11:21:58 -04:00
Kyle McMartin d0ba439bf2 kernel-arm64.patch: update from git 2014-07-29 13:40:33 -04:00
Kyle McMartin b8a1bd4593 kernel-arm64.patch: update from git 2014-07-29 13:38:31 -04:00
Josh Boyer 3b02d5342b Linux v3.16-rc7-7-g31dab719fa50
- Reenable debugging options.
2014-07-29 09:41:04 -04:00
Josh Boyer b83add205a Linux v3.16-rc7-7-g31dab719fa50
- Reenable debugging options.
2014-07-29 09:40:47 -04:00
Josh Boyer 008cb40b0e Make sure acpi brightness_switch is disabled (like forever in Fedora)
Upstream reverted the change to turn the ACPI brightness_switch_enabled
parameter off by default.  Revert the revert so we go back to the state
Fedora has traditionally been in.
2014-07-28 13:03:51 -04:00
Josh Boyer e6fe382d1d Make sure acpi brightness_switch is disabled (like forever in Fedora)
Upstream reverted the change to turn the ACPI brightness_switch_enabled
parameter off by default.  Revert the revert so we go back to the state
Fedora has traditionally been in.
2014-07-28 13:03:03 -04:00
Josh Boyer 52a09ec25d CVE-2014-5077 sctp: fix NULL ptr dereference (rhbz 1122982 1123696) 2014-07-28 09:48:40 -04:00
Josh Boyer 1416cd4c0b CVE-2014-5077 sctp: fix NULL ptr dereference (rhbz 1122982 1123696) 2014-07-28 09:48:30 -04:00
Josh Boyer af8c51e297 Linux v3.16-rc7
- Disable debugging options.
2014-07-28 08:04:00 -04:00
Josh Boyer f65a465ccd Linux v3.16-rc7
- Disable debugging options.
2014-07-28 08:02:24 -04:00
Peter Robinson 4ff978841c Add patch to fix loading of tegra drm using device tree 2014-07-28 10:14:52 +01:00
Peter Robinson 9481127c25 Add patch to fix loading of tegra drm using device tree 2014-07-28 10:13:52 +01:00
Josh Boyer 672d377642 Linux v3.16-rc6-139-g9c5502189fa0 2014-07-26 09:44:56 -04:00
Josh Boyer 5832c90689 Linux v3.16-rc6-139-g9c5502189fa0 2014-07-26 09:44:41 -04:00
Adam Williamson a107075427 Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel into baytrail 2014-07-25 18:56:30 -07:00
Adam Williamson c72e049493 baytrail modifications: power management stuff 2014-07-25 18:55:55 -07:00
Kyle McMartin eac206a78c update the cow for rawhide 2014-07-25 10:24:47 -04:00
Josh Boyer 55d061a487 Linux v3.16-rc6-118-g82e13c71bc65 2014-07-25 10:04:05 -04:00
Josh Boyer bb2e8de70e Linux v3.16-rc6-118-g82e13c71bc65 2014-07-25 10:03:55 -04:00
Josh Boyer d35b963d10 Fix selinux sock_graft hook for AF_ALG address family (rhbz 1115120) 2014-07-25 08:18:07 -04:00
Josh Boyer 7d60e1ecb9 Fix selinux sock_graft hook for AF_ALG address family (rhbz 1115120) 2014-07-25 08:18:02 -04:00
Kyle McMartin 36ebbb459e arm64: update config-arm64 to include PCI support. 2014-07-25 07:54:04 -04:00
Kyle McMartin 2989acc54f kernel-arm64.patch: update from git 2014-07-25 07:54:00 -04:00
Kyle McMartin f12a594c2d arm64: update config-arm64 to include PCI support. 2014-07-24 19:20:52 -04:00
Kyle McMartin f7f5d678ad kernel-arm64.patch: update from git 2014-07-24 18:57:04 -04:00
Josh Boyer 1df4db95d4 CVE-2014-5045 vfs: refcount issues during lazy umount on symlink (rhbz 1122471 1122482) 2014-07-24 12:05:07 -04:00
Josh Boyer b052f24552 CVE-2014-5045 vfs: refcount issues during lazy umount on symlink (rhbz 1122471 1122482) 2014-07-24 12:04:54 -04:00
Josh Boyer 8b88e289e5 Fix regression in sched_setparam (rhbz 1117942) 2014-07-24 10:44:56 -04:00
Josh Boyer eae6506625 Fix regression in sched_setparam (rhbz 1117942) 2014-07-24 10:44:37 -04:00
Justin M. Forbes 0d68739626 Linux v3.16-rc6-75-g15ba223 2014-07-22 08:47:17 -05:00
Justin M. Forbes 182986bc25 Linux v3.16-rc6-75-g15ba223 2014-07-22 08:45:36 -05:00
Justin M. Forbes 8984fe8345 Linux v3.16-rc6 2014-07-21 16:22:36 -05:00
Justin M. Forbes 4ac0f0fa03 Linux v3.16-rc6 2014-07-21 12:53:39 -05:00
Peter Robinson f225c08d6d Minor ARMv7 config update 2014-07-21 13:42:30 +01:00
Peter Robinson ac6522333e Minor ARMv7 config update 2014-07-21 13:41:52 +01:00
Josh Boyer c8c6389f2b Linux v3.16-rc5-143-gb6603fe574af 2014-07-17 12:30:07 -04:00
Josh Boyer ed1c634a18 Linux v3.16-rc5-143-gb6603fe574af 2014-07-17 12:30:00 -04:00
Josh Boyer e54319590a Enable hermes prism driver (rhbz 1120393) 2014-07-16 17:45:17 -04:00
Josh Boyer b8207bb9c8 Enable hermes prism driver (rhbz 1120393) 2014-07-16 17:44:10 -04:00
Josh Boyer 84093725a9 Linux v3.16-rc5-130-g2da294474093
- Reenable debugging options.
2014-07-16 14:35:58 -04:00
Josh Boyer 4eb1075e8c Linux v3.16-rc5-130-g2da294474093
- Reenable debugging options.
2014-07-16 14:35:50 -04:00
Josh Boyer 7c50c7da7e Linux v3.16-rc5
- Fix i915 regression with external monitors (rhbz 1117008)
- Disable debugging options.
2014-07-14 09:39:53 -04:00
Josh Boyer 1b96f577c5 Linux v3.16-rc5
- Fix i915 regression with external monitors (rhbz 1117008)
- Disable debugging options.
2014-07-14 09:39:31 -04:00
Tom Callaway 1e17b30367 fix license handling. no build here, it can wait for the next kernel build to be applied 2014-07-12 18:37:53 -04:00
Tom Callaway d23e5375ca fix license handling. no build here, it can wait for the next kernel build to be applied 2014-07-12 18:37:40 -04:00
Josh Boyer c849684e55 Drop intel pstate patches. Fixup arm64 patch 2014-07-11 12:28:53 -04:00
Josh Boyer e10ca61850 Drop intel pstate patches. Fixup arm64 patch 2014-07-11 12:28:27 -04:00
Josh Boyer 1ead5b6b68 Linux v3.16-rc4-120-g85d90faed31e 2014-07-11 11:46:04 -04:00
Josh Boyer 566922f05f Linux v3.16-rc4-120-g85d90faed31e 2014-07-11 10:36:01 -04:00