Commit Graph

3024 Commits

Author SHA1 Message Date
Hans de Goede
7d2c2f2d91 Bring in patch-series from drm-next to fix skl_update_other_pipe_wm issues
(rhbz 1305038)
- Disable fbc on haswell by default (fdo#96461)
2016-06-22 16:48:16 +02:00
Laura Abbott
0c5f975449 Linux v4.7-rc4-14-g67016f6
- Reenable debugging options.
2016-06-21 08:00:33 -07:00
Laura Abbott
f0b1197ecc Linux v4.7-rc4
- Disable debugging options.
2016-06-20 08:08:28 -07:00
Laura Abbott
f792d26394 Linux v4.7-rc3-87-gbb96727
- enable CONFIG_PWM (rhbz 1347454)
2016-06-17 09:45:33 -07:00
Laura Abbott
eeb0cbe5da Linux v4.7-rc3-55-gd325ea8 2016-06-16 07:48:22 -07:00
Laura Abbott
a241169071 hp-wmi: fix wifi cannot be hard-unblock (rhbz 1338025) 2016-06-15 16:00:06 -07:00
Josh Boyer
6e89960c91 CVE-2016-4470 keys: uninitialized variable crash (rhbz 1341716 1346626) 2016-06-15 09:53:49 -04:00
Peter Robinson
7876ded218 Enable support for TI dm81xx devices (kwizart) 2016-06-15 12:02:47 +01:00
Laura Abbott
9e60057b8b ath9k: fix GPIO mask for AR9462 and AR9565 (rhbz 1346145) 2016-06-14 08:50:45 -07:00
Laura Abbott
52c0751a56 Linux v4.7-rc3-9-gdb06d75
- Reenable debugging options.
2016-06-14 08:33:42 -07:00
Peter Robinson
af16af05c2 Enable Infiniband on ARM now we have HW 2016-06-14 11:47:49 +01:00
Laura Abbott
4b9053da49 Linux v4.7-rc3
- Disable debugging options.
2016-06-13 08:18:37 -07:00
Peter Robinson
d100a58678 tag and build to move Power64 builds forward 2016-06-11 14:28:25 +01:00
Peter Robinson
015d26a2a3 Fix Power64 module filters, Minor ARM updates 2016-06-10 18:37:48 +01:00
Laura Abbott
548e479cde Linux v4.7-rc2-64-g147d9e7 2016-06-10 08:15:17 -07:00
Josh Boyer
7fd65eb71b Drop upstreamed patch ideapad patch
This went upstream as edde316acb5f07c04abf09a92f59db5d2efd14e2
2016-06-09 10:20:19 -04:00
Peter Robinson
0c7768266b Enable ARM big.LITTLE on ARMv7 LPAE kernels 2016-06-09 09:16:47 +01:00
Laura Abbott
6018c78135 Linux v4.7-rc2-20-gc8ae067 2016-06-08 08:32:42 -07:00
Peter Robinson
2e3ed492cf Minor ARM/aarch64 config updates 2016-06-08 14:49:29 +01:00
Laura Abbott
3d3e17409c Linux v4.7-rc2-4-g3613a62 2016-06-07 06:05:07 -07:00
Josh Boyer
bcab537859 CVE-2016-5244 info leak in rds (rhbz 1343338 1343337) 2016-06-07 08:27:33 -04:00
Josh Boyer
1a579a0155 CVE-2016-5243 info leak in tipc (rhbz 1343338 1343335) 2016-06-07 08:17:12 -04:00
Laura Abbott
874cad1ebd Linux v4.7-rc2
- Disable debugging options.
2016-06-06 09:02:12 -07:00
Laura Abbott
1f8e5f1d70 Linux v4.7-rc1-122-g4340fa5 2016-06-03 07:47:15 -07:00
Laura Abbott
9a2ace331f Linux v4.7-rc1-104-g719af93 2016-06-02 08:34:38 -07:00
Laura Abbott
6a51c81bc3 Add filtering for i686 as well 2016-06-01 14:59:49 -07:00
Laura Abbott
d9267fb346 Linux v4.7-rc1-94-g6b15d66
- Reenable debugging options.
2016-06-01 07:28:13 -07:00
Laura Abbott
57618355c4 Update module filters 2016-05-31 15:00:50 -07:00
Laura Abbott
65e6810859 Linux v4.7-rc1-12-g852f42a
- Disable debugging options.
2016-05-31 09:38:34 -07:00
Peter Robinson
4323a8b61b Initial Qualcomm ARM64 support (Dragonboard 410c) 2016-05-30 17:25:48 +01:00
Peter Robinson
7d1f6548fe Minor ARM cleanups 2016-05-30 14:32:47 +01:00
Peter Robinson
961d16042c Update Utilite patch 2016-05-28 10:13:58 +01:00
Laura Abbott
a211bbb3e5 Linux v4.6-11010-gdc03c0f
- Kconfig, Kbuild, ceph, nfs, xfs, mmc, hwmon merges
2016-05-27 07:47:54 -07:00
Laura Abbott
bf545878d0 Linux v4.6-10675-g2f7c3a1
- EFI, sched, perf, objtool, acpi, pm, drm merges
2016-05-26 09:45:31 -07:00
Laura Abbott
b43cd99713 Linux v4.6-10530-g28165ec
- ARM SoC, asm-generic, nfsd, ext4, spi, mtd, xen, merges
2016-05-25 09:03:36 -07:00
Josh Boyer
42d2805cbe Linux v4.6-10203-g84787c572d40
- Enable CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE (rhbz 1339281)
- Fixup SB patchset to work with upstream changes
2016-05-25 11:13:52 -04:00
Laura Abbott
cfaea7dc72 Linux v4.6-8907-g7639dad
- trace, f2fs, btrfs, rtc, mailbox, akpm, staging, driver core, char, usb,
  tty, clk, net, devicetree, rdma, mfd, iio, powerpc, arm merges
2016-05-23 11:41:00 -07:00
Laura Abbott
8a052bf240 Linux v4.6-6148-g03b979d
- Docs, i2c, md, iommu, sound, pci, pinctrl, dmaengine, kvm, security merges
2016-05-20 11:25:00 -07:00
Josh Boyer
e8f3f4f939 CVE-2016-4440 kvm: incorrect state leading to APIC register access (rhbz 1337806 1337807) 2016-05-20 09:01:34 -04:00
Peter Robinson
d141433bf1 Minor ARM cleanups, enable Tegra USB-3 controller, drop dead DSA_MV 2016-05-20 12:05:37 +01:00
Laura Abbott
39bfc7e6a1 Linux v4.6-5028-g2600a46
trace, audit, input, media, scsi, armsoc merges
2016-05-19 09:50:01 -07:00
Laura Abbott
af495309bb Linux v4.6-3623-g0b7962a
ata, regulator, gpio, HID, livepatching, networking, dm, block, vfs, fs,
timers, crypto merges
2016-05-18 08:32:30 -07:00
Laura Abbott
3856ef7eb1 Adjust solib for cpupower
See ac5a181d065d ("cpupower: Add cpuidle parts into library")
2016-05-17 15:54:58 -07:00
Laura Abbott
0102737055 Linux v4.6-1278-g1649098
- Enable CONFIG_INTEL_POWERCLAMP
- pm, ACPI, mmc, regulator, i2c, hwmon, edac, led, arm64, x86, sched, RAS merges
2016-05-17 09:35:57 -07:00
Laura Abbott
c3b50ba0e0 Linux v4.6-153-g3469d26
- Reenable debugging options.
- locking, efi, signals, rcu merges
2016-05-16 15:50:03 -07:00
Justin M. Forbes
9b3b59db20 Disable CONFIG_DEBUG_VM_PGFLAGS on non debug kernels (rhbz 1335173) 2016-05-16 11:43:04 -05:00
Josh Boyer
6c1de60a56 CVE-2016-3713 kvm: out-of-bounds access in set_var_mtrr_msr (rhbz 1332139 1336410) 2016-05-16 10:26:36 -04:00
Josh Boyer
c139414777 Linux v4.6 2016-05-16 10:23:44 -04:00
Josh Boyer
6b8dfd16b6 Linux v4.6-rc7-116-ga2ccb68b1e6a 2016-05-13 11:30:08 -04:00
Peter Robinson
0c1193cdac add credit to Jeremy Linton 2016-05-12 18:08:04 +01:00
Peter Robinson
df7dea68b2 Enable PCI_HOST_GENERIC for all ARM arches 2016-05-12 18:04:14 +01:00
Peter Robinson
104dc06690 Some minor ARMv7 platform fixes from F-24 2016-05-12 14:27:29 +01:00
Josh Boyer
4f98eabc01 Linux v4.6-rc7-55-gc5114626f33b 2016-05-11 10:15:07 -04:00
Josh Boyer
e0602bcbc4 Linux v4.6-rc7-45-g2d0bd9534c8d 2016-05-10 10:45:12 -04:00
Josh Boyer
802cbf8509 Enable XEN SCSI front and backend (rhbz 1334512) 2016-05-10 08:25:00 -04:00
Josh Boyer
4bf3dea79c CVE-2016-4569 info leak in sound module (rhbz 1334643 1334645) 2016-05-10 08:20:23 -04:00
Josh Boyer
0494a46c4e Linux v4.6-rc7 2016-05-09 13:45:56 -04:00
Josh Boyer
452fe53fe0 Linux v4.6-rc6-165-g9caa7e78481f 2016-05-06 11:49:47 -04:00
Josh Boyer
8924c0af02 Linux v4.6-rc6-123-g21a9703de304 2016-05-05 13:21:03 -04:00
Josh Boyer
a26d52b3e9 CVE-2016-4486 CVE-2016-4485 info leaks (rhbz 1333316 1333309 1333321) 2016-05-05 08:51:54 -04:00
Josh Boyer
ba418dcee2 Linux v4.6-rc6-113-g83858a701cf3
- Enable NFC_NXP_NCI options (rhbz 1290556)
2016-05-04 10:56:55 -04:00
Josh Boyer
c70306a69b Fix changelog date 2016-05-04 08:29:54 -04:00
Josh Boyer
e0b4d238ee CVE-2016-4482 info leak in devio.c (rhbz 1332931 1332932) 2016-05-04 08:20:36 -04:00
Josh Boyer
cbdaacf012 Linux v4.6-rc6-72-g33656a1f2ee5 2016-05-03 20:06:19 -04:00
Josh Boyer
5f62b8bc20 Linux v4.6-rc6
- Disable debugging options.
2016-05-02 09:36:00 -04:00
Josh Boyer
9bf052c14f Linux v4.6-rc5-153-g92c19ea95357 2016-04-29 11:20:27 -04:00
Justin M. Forbes
2f85fe0f9e Fix KVM with THP corruption (rhbz 1331092) 2016-04-28 14:26:27 -05:00
Josh Boyer
f9f9100e3c Linux v4.6-rc5-89-gb75a2bf899b6 2016-04-28 12:13:22 -04:00
Peter Robinson
57a67d35d1 fix i.MX6 gpu module loading, fix Jetson TX1 usb 2016-04-28 13:42:42 +01:00
Josh Boyer
e07a3bae84 Linux v4.6-rc5-69-gf28f20da704d
- Require /usr/bin/kernel-install to fix installation after systemd package
  swizzling (rhbz 1331012)
- Reenable debugging options.
2016-04-27 11:29:16 -04:00
Josh Boyer
842d583fea Enable IEEE802154_AT86RF230 on more arches (rhbz 1330356) 2016-04-26 11:09:38 -04:00
Josh Boyer
4ee66c3a57 Avoid unnecessary warnings when deleting a network device 2016-04-26 10:58:40 -04:00
Josh Boyer
f5b0e8bac7 Linux v4.6-rc5
- Disable debugging options.
2016-04-25 11:10:15 -04:00
Josh Boyer
2e035231b7 Linux v4.6-rc4-124-g5f44abd041c5 2016-04-22 11:19:52 -04:00
Josh Boyer
6a43b5a1e3 Linux v4.6-rc4-17-g55f058e7574c 2016-04-21 10:51:18 -04:00
Laura Abbott
f05c342f65 Allow antenna selection for rtl8723be (rhbz 1309487) 2016-04-20 10:07:23 -07:00
Josh Boyer
993b8217dd Linux v4.6-rc4-13-g9a0e3eea25d3
- Reenable debugging options.
2016-04-20 10:30:43 -04:00
Josh Boyer
005d233274 Enable XILLYBUS (rhbz 1328394) 2016-04-19 09:39:30 -04:00
Josh Boyer
e4c8b25896 Linux v4.6-rc4
- Disable debugging options.
2016-04-18 11:43:23 -04:00
Josh Boyer
0fb64a2ea0 CVE-2016-3961 xen: hugetlbfs use may crash PV guests (rhbz 1327219 1323956) 2016-04-15 11:27:30 -04:00
Josh Boyer
24a19dda7e Linux v4.6-rc3-99-g806fdcce017d 2016-04-15 11:10:36 -04:00
Josh Boyer
12ae10f97a Disable oprofile driver as userspace oprofile only uses perf (rhbz 1326944) 2016-04-14 14:29:48 -04:00
Josh Boyer
016754b013 Linux v4.6-rc3-57-g90de6800c240
- Reenable debugging options.
2016-04-14 11:18:25 -04:00
Josh Boyer
7b6b31a413 Linux v4.6-rc3
- Disable debugging options.
2016-04-11 09:31:30 -04:00
Peter Robinson
e9555570fe Use the correct MMC driver for some ARM platforms 2016-04-10 12:35:21 +01:00
Justin M. Forbes
f7b266df32 Linux v4.6-rc2-151-g3c96888 2016-04-08 11:34:38 -05:00
Justin M. Forbes
d8ab3d0f41 Linux v4.6-rc2-88-gc4004b0 2016-04-07 09:37:09 -05:00
Justin M. Forbes
a13ce036d5 Linux v4.6-rc2-42-g1e1e5ce 2016-04-06 09:48:09 -05:00
Justin M. Forbes
54d4914c27 Linux v4.6-rc2-42-g1e1e5ce 2016-04-05 10:22:12 -05:00
Justin M. Forbes
553fb157d6 Linux v4.6-rc2 2016-04-04 08:02:19 -05:00
Peter Robinson
6daf6840fb Some minor ARMv7/aarch64 cleanups 2016-04-03 23:45:44 +01:00
Josh Boyer
2c8998104c Add another patch for CVE-2016-2184 2016-03-31 14:39:34 -04:00
Josh Boyer
b37bd2e19d Fix undefined __always_inline in exported headers (rhbz 1321749) 2016-03-30 15:54:52 -04:00
Josh Boyer
803c5b964d Make sure to install objtool in -devel subpackage if it exists (rhbz 1321628) 2016-03-30 13:50:01 -04:00
Peter Robinson
320e8673c0 Boot fix for aarch64 devices with 64K page size requirements (Seattle) - lets try this smaller one first actually 2016-03-30 12:32:42 +01:00
Peter Robinson
71dd821a33 Revert "Add patches to fix boot on 64K page aarch64 devices (eg Seattle)"
This reverts commit e38017c2c6.
2016-03-30 12:30:06 +01:00
Peter Robinson
e38017c2c6 Add patches to fix boot on 64K page aarch64 devices (eg Seattle)
Add the following series that in theory fixes boot on aarch64. It's ACKed
and has pull reqs for upstream so in theory upstream should have tested
this, although I have my doubts. If it is in fact crack just revert and
I'll go and beat ^W work something else out.
2016-03-30 12:20:49 +01:00
Peter Robinson
9be752be57 Add ARMv7 mvebu fixes headed upstream, Minor ARMv7 cleanups 2016-03-30 11:30:33 +01:00
Josh Boyer
47ad5d57a3 Linux v4.6-rc1
- Disable debugging options.
2016-03-28 07:43:02 -04:00
Josh Boyer
846bc92b91 Linux v4.5-12596-g11caf57f6a4b
- asm-generic, pm+acpi, rtc, hwmon, block, mtd, ubifs, nfsd, kbuild, parisc,
  h8, arm64, armsoc
2016-03-25 10:19:40 -04:00
Josh Boyer
7acc192a3c Linux v4.5-12330-ge46b4e2b46e1
- trace, thermal, nfsd merges
2016-03-24 20:40:51 -04:00
Josh Boyer
6a44257de7 Linux v4.5-12257-g8b97be054572
- staging, timers, perf, irq, x86, sched, locking merges
2016-03-24 15:20:33 -04:00
Josh Boyer
ea3aaf7b01 Linux v4.5-12149-gaca04ce
- net, pwm, target, platform-drivers merges
2016-03-24 09:32:31 -04:00
Josh Boyer
4d5b4fb36b Add another patch for CVE-2016-2185 2016-03-23 13:58:43 -04:00
Josh Boyer
62d5948052 Linux v4.5-12013-gc13042362033
- crypto, mailbox, clk merges
2016-03-23 10:52:43 -04:00
Josh Boyer
10af6f3233 Linux v4.5-11787-ga24e3d414e59
- akpm, kvm, rdma
2016-03-23 08:54:11 -04:00
Peter Robinson
a61878ea2f Fix Tegra Jetson TK1 2016-03-23 12:18:35 +00:00
Josh Boyer
caf67e0739 Linux v4.5-11312-g01cde1538e1d
- nfs, overlayfs, fuse, xen, i2c, target, pci, sound, iommu merges
2016-03-22 18:01:56 -04:00
Josh Boyer
a01e1aa804 CVE-2016-3136 mct_u232: oops on invalid USB descriptors (rhbz 1317007 1317010) 2016-03-22 14:25:03 -04:00
Josh Boyer
e1aff3fede CVE-2016-2187 gtco: oops on invalid USB descriptors (rhbz 1317017 1317010) 2016-03-22 14:17:30 -04:00
Josh Boyer
ae683f28f5 Linux v4.5-11118-g968f3e374faf
- btrfs, mmc, md merges
2016-03-22 09:09:09 -04:00
Josh Boyer
5093f682b9 Linux v4.5-10883-g770c4c1119db
- drm, arm64-perf, arc, udf, quota merges
2016-03-21 19:59:11 -04:00
Josh Boyer
32ae36ddce Linux v4.5-9714-g53d2e6976bd4
- xfs, f2fs, cgroup merges
2016-03-21 17:37:06 -04:00
Laura Abbott
39e53b54d0 Misc fixes
- uas: Limit qdepth at the scsi-host level (rhbz 1315013)
- Fix for performance regression caused by thermal (rhbz 1317190)
- Input: synaptics - handle spurious release of trackstick buttons, again (rhbz 1318079)
2016-03-21 11:08:06 -07:00
Josh Boyer
5724250a0a Linux v4.5-9542-g643ad15d4741
- pekeys, efi, objtool merges
2016-03-21 13:05:41 -04:00
Josh Boyer
f20b3e7657 Linux v4.5-9406-g46e595a17dcf
- xtensa, mailbox, vhost, all the armsoc merges
2016-03-21 11:34:16 -04:00
Peter Robinson
8bfaf21554 Minor aarch64 cleanups 2016-03-21 13:40:55 +00:00
Josh Boyer
da001e9088 Linux v4.5-8524-g1e75a9f34a5e
- watchdog, firewire, vfs, linux-arm, sh, powerpc, audit, device tree merges
2016-03-21 09:06:46 -04:00
Josh Boyer
a702c978d3 Linux v4.5-8194-g1200b6809dfd
- net merge
- Comment out stmmac patches as they break the build
2016-03-20 09:47:56 -04:00
Josh Boyer
8e2d7107d3 Linux v4.5-6486-g6b5f04b6cf8e
- cgroup, libata, workqueue, block, akpm, usb merges
2016-03-19 16:14:02 -04:00
Peter Robinson
bf70cee80d Upstream fix for stmmac driver regressions (AllWinner Gb NICs) until it lands upstream 2016-03-19 12:01:49 +00:00
Peter Robinson
e398f45192 Update geekbox patch to v4 2016-03-19 11:49:04 +00:00
Peter Robinson
61a9f1c04f Minor ARM cleanups, Drop ARM_PATCH_IDIV work around 2016-03-19 08:57:54 +00:00
Josh Boyer
96bb3e4edb Linux v4.5-6229-gf7813ad5cbfd
- ipmi, mfd, sound merges
2016-03-18 16:52:17 -04:00
Josh Boyer
9b73a1330f Change requires to updated package names and correctly Requires findutils
in -devel package (rhbz 1319131)
2016-03-18 15:02:57 -04:00
Josh Boyer
512632944a Linux v4.5-5842-g9ea446352047
- staging, rdma merges
2016-03-18 14:38:52 -04:00
Josh Boyer
1dea4eb579 Linux v4.5-4071-g10fdfee7f7fd
- input, livepatching, trivial, hid, gpio, m68knommu, arm64, selftest merges
2016-03-18 13:10:43 -04:00
Josh Boyer
8b7fda18c9 ims-pcu: sanity checking on missing interfaces 2016-03-18 11:13:36 -04:00
Josh Boyer
c2763b5687 CVE-2016-3140 digi_acceleport: oops on invalid USB descriptors (rhbz 1317010 1316995) 2016-03-18 11:07:32 -04:00
Josh Boyer
9e1b14ab48 CVE-2016-3138 cdc_acm: oops on invalid USB descriptors (rhbz 1317010 1316204) 2016-03-18 11:01:01 -04:00
Josh Boyer
b1afb06566 CVE-2016-2185 ati_remote2: oops on invalid USB descriptors (rhbz 1317014 1317471) 2016-03-18 10:50:39 -04:00
Josh Boyer
89cc46c010 CVE-2016-2188 iowarrior: oops on invalid USB descriptors (rhbz 1317018 1317467) 2016-03-18 10:39:34 -04:00
Josh Boyer
4c948d6d0b CVE-2016-2186 powermate: oops on invalid USB descriptors (rhbz 1317015 1317464) 2016-03-18 10:34:07 -04:00
Josh Boyer
62042830a6 CVE-2016-3137 cypress_m8: oops on invalid USB descriptors (rhbz 1317010 1316996) 2016-03-18 10:24:26 -04:00
Josh Boyer
d6943d1d0b CVE-2016-2184 alsa: panic on invalid USB descriptors (rhbz 1317012 1317470) 2016-03-18 10:13:07 -04:00
Josh Boyer
1e6dda8d92 Linux v4.5-3654-g5cd0911a9e0e
- Fix oops from tsc subsystem (rhbz 1318596)
- crypto, security, docs, rproc, dmaengine, powersupply, hsi, vfio, driver-core,
  tty, char, usb, configfs, ext4, dlm, gfs2, pstore merges
2016-03-18 09:54:47 -04:00
Josh Boyer
47bb021b79 Add temporary patch to fix intel_pstate oops and lockdep report on
various atom based CPUs.
2016-03-17 12:45:58 -04:00
Josh Boyer
0a82643423 Linux v4.5-2535-g09fd671ccb24
- fbdev, media, libnvdimm, dm, scsi, ibft merges
2016-03-17 10:37:39 -04:00
Josh Boyer
be0af1dc52 Linux v4.5-1822-g63e30271b04c
- PCI, PM+ACPI merges
2016-03-17 08:44:16 -04:00
Josh Boyer
3aed0a63bd Linux v4.5-1523-g271ecc5253e2
- akpm patches (mm subsystem, various)
2016-03-16 17:47:30 -04:00
Josh Boyer
dc42e4c06a Linux v4.5-1402-gaa6865d83641
- s390, m68k, avr32, KVM, EDAC merges
2016-03-16 15:36:23 -04:00
Josh Boyer
3bed0673fa Linux v4.5-1127-g9256d5a308c9
- pinctrl, LED, rtc, hwmon, regulator, regmap, spi merges
2016-03-16 10:12:59 -04:00
Josh Boyer
6f9c14ed9c CVE-2016-3135 ipv4: DoS when destroying a network interface (rhbz 1318172 1318270) 2016-03-16 08:21:56 -04:00
Josh Boyer
cb176ec4e7 Linux v4.5-760-g710d60cbf1b3 2016-03-16 07:43:17 -04:00
Josh Boyer
5afcc1a929 Linux v4.5-481-ge23604edac2a
- Enable RANDOMIZE_BASE
- Reenable debugging options.
2016-03-15 12:59:36 -04:00
Justin M. Forbes
de5f58c120 Linux v4.5 2016-03-14 11:25:08 -05:00
Josh Boyer
b653e2ee31 CVE-2016-3134 netfilter: missing bounds check in ipt_entry struct (rhbz 1317383 1317384) 2016-03-14 08:51:16 -04:00
Josh Boyer
835b170e9c CVE-2016-3135 netfilter: size overflow in x_tables (rhbz 1317386 1317387) 2016-03-14 08:45:24 -04:00
Josh Boyer
be35f77c2a Add patch for ICP DAS I-756xU devices (rhbz 1316136) 2016-03-11 08:15:44 -05:00
Justin M. Forbes
3127403f31 Linux v4.5-rc7-215-gf2c1242 2016-03-10 15:21:34 -06:00