mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-12 03:26:26 +00:00
Code Issues Releases Wiki Activity
536177 commits 105 branches 5111 tags 5.9 GiB
Commit graph

22199 commits

Author SHA1 Message Date
Ben Skeggs
c47a48a544 drm/nouveau/mc: switch to subdev printk macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:23 +10:00
Ben Skeggs
59e1a2f1a6 drm/nouveau/ltc: switch to subdev printk macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:23 +10:00
Ben Skeggs
00c5550710 drm/nouveau/imem: switch to subdev printk macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:23 +10:00
Ben Skeggs
18019e95de drm/nouveau/ibus: switch to subdev printk macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:23 +10:00
Ben Skeggs
1cb57d25b6 drm/nouveau/i2c: switch to subdev printk macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:22 +10:00
Ben Skeggs
3ecd329b64 drm/nouveau/fb: switch to subdev printk macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:22 +10:00
Ben Skeggs
aa860e4bbe drm/nouveau/devinit: switch to subdev printk macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:22 +10:00
Ben Skeggs
b907649e7b drm/nouveau/clk: switch to subdev printk macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:22 +10:00
Ben Skeggs
a699a85add drm/nouveau/bus: switch to subdev printk macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:22 +10:00
Ben Skeggs
60b29d2071 drm/nouveau/bios: switch to subdev printk macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:22 +10:00
Ben Skeggs
0df18e6d52 drm/nouveau/bar: switch to subdev printk macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:22 +10:00
Ben Skeggs
6594363b9f drm/nouveau/core: type-safe printk macros 
These require an explicit pointers to nvkm_object/nvkm_subdev/nvkm_device,
depending on which macros are used.  This is unlike the previous macros
which take a void *, and work for anything derived from nvkm_object (by
way of some awful heuristics).

The output will be a bit confused until everything has been transitioned,
as the logging format used is a more standard style that previously.

In addition, usage of pr_cont(), which doesn't work correctly with the
dev_*() printk functions (and was potentially racy to begin with), will
be replaced.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:21 +10:00
Ben Skeggs
5444204036 drm/nouveau: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:21 +10:00
Ben Skeggs
37eabb030c drm/nouveau/mpeg: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:21 +10:00
Ben Skeggs
c4584adc37 drm/nouveau/gr: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:21 +10:00
Ben Skeggs
af3082b3c6 drm/nouveau/fifo: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:21 +10:00
Ben Skeggs
3a020b4dfc drm/nouveau/disp: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:21 +10:00
Ben Skeggs
6ed5c16824 drm/nouveau/falcon: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:20 +10:00
Ben Skeggs
dd4bb3eccc drm/nouveau/pmu: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:20 +10:00
Ben Skeggs
909604d444 drm/nouveau/mmu: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:20 +10:00
Ben Skeggs
1302bcbb82 drm/nouveau/ltc: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:20 +10:00
Ben Skeggs
63bb5c390b drm/nouveau/ibus: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:20 +10:00
Ben Skeggs
cf07d861ce drm/nouveau/fb: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:20 +10:00
Ben Skeggs
6979c6303a drm/nouveau/clk: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:20 +10:00
Ben Skeggs
4f31c84eba drm/nouveau/bus: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:19 +10:00
Ben Skeggs
4dd308f446 drm/nouveau/bar: switch to new-style timer macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:19 +10:00
Ben Skeggs
56f67dc196 drm/nouveau/tmr: type-safe PTIMER-based delay/wait macros 
These require an explicit struct nvkm_device pointer, unlike the previous
macros which take a void *, and work for (almost) anything derived from
nvkm_object by using some heuristics.

These macros are more general than the previous ones, and can be used to
handle PTIMER-based busy-waits (will be used in later devinit fixes) as
well as more complicated wait conditions.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:19 +10:00
Ben Skeggs
2ebfa1bc6f drm/nouveau/kms/nv04: fix incorrect use of register accessors 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:19 +10:00
Ben Skeggs
01d64afc2e drm/nouveau/sw: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:19 +10:00
Ben Skeggs
b8ad561e55 drm/nouveau/sec: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:19 +10:00
Ben Skeggs
846e831d95 drm/nouveau/pm: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:19 +10:00
Ben Skeggs
f2d85ad1a6 drm/nouveau/msvld: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:18 +10:00
Ben Skeggs
320ca25131 drm/nouveau/msppp: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:18 +10:00
Ben Skeggs
54118c74fb drm/nouveau/mspdec: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:18 +10:00
Ben Skeggs
636e37aa97 drm/nouveau/mpeg: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:18 +10:00
Ben Skeggs
276836d46e drm/nouveau/gr: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:17 +10:00
Ben Skeggs
8774440390 drm/nouveau/fifo: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:17 +10:00
Ben Skeggs
2fde1f1c34 drm/nouveau/disp: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:17 +10:00
Ben Skeggs
f9793bb7ed drm/nouveau/device: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:17 +10:00
Ben Skeggs
b958bf916d drm/nouveau/cipher: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:17 +10:00
Ben Skeggs
29e9f51094 drm/nouveau/ce: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:17 +10:00
Ben Skeggs
2ef770f743 drm/nouveau/xtensa: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:16 +10:00
Ben Skeggs
96975248ee drm/nouveau/falcon: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:16 +10:00
Ben Skeggs
c44c049f28 drm/nouveau/tmr: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:16 +10:00
Ben Skeggs
5718ea3257 drm/nouveau/therm: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:16 +10:00
Ben Skeggs
bef002e87f drm/nouveau/pmu: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:16 +10:00
Ben Skeggs
83f56106ea drm/nouveau/mmu: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:16 +10:00
Ben Skeggs
25e3a463fc drm/nouveau/mc: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:15 +10:00
Ben Skeggs
99336ed363 drm/nouveau/ltc: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:15 +10:00
Ben Skeggs
d5c5bcf693 drm/nouveau/imem: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:15 +10:00
Ben Skeggs
fef5cc0f25 drm/nouveau/ibus: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:15 +10:00
Ben Skeggs
6f22749910 drm/nouveau/i2c: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:15 +10:00
Ben Skeggs
4de93a086e drm/nouveau/gpio: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:15 +10:00
Ben Skeggs
2bdb4995fd drm/nouveau/fuse: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:14 +10:00
Ben Skeggs
6758745b28 drm/nouveau/fb: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:14 +10:00
Ben Skeggs
8ac3f64f75 drm/nouveau/devinit: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:14 +10:00
Ben Skeggs
822ad79fa4 drm/nouveau/clk: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:14 +10:00
Ben Skeggs
14caba447c drm/nouveau/bus: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:14 +10:00
Ben Skeggs
d8f266a353 drm/nouveau/bios: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:14 +10:00
Ben Skeggs
9155c16214 drm/nouveau/bar: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:14 +10:00
Ben Skeggs
94bab10223 drm/nouveau/core: switch to device pri macros 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:13 +10:00
Ben Skeggs
dd64694208 drm/nouveau/device: type-safe register accessor macros 
These require an explit struct nvkm_device pointer, unlike the previous
macros which take a void *, and assume it's any old nvkm_subdev.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:13 +10:00
Ben Skeggs
8699745a2b drm/nouveau/vp: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:13 +10:00
Ben Skeggs
226dcefe70 drm/nouveau/sw: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:13 +10:00
Ben Skeggs
c0e297dc61 drm/nouveau/sec: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:13 +10:00
Ben Skeggs
8c1aeaa139 drm/nouveau/pm: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:12 +10:00
Ben Skeggs
74137ffcd1 drm/nouveau/msvld: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:12 +10:00
Ben Skeggs
fd507a53ab drm/nouveau/msppp: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:12 +10:00
Ben Skeggs
11271f9f8f drm/nouveau/mspdec: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:12 +10:00
Ben Skeggs
b19de4f3d7 drm/nouveau/mpeg: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:12 +10:00
Ben Skeggs
bfee3f3d97 drm/nouveau/gr: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:11 +10:00
Ben Skeggs
6189f1b093 drm/nouveau/fifo: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:11 +10:00
Ben Skeggs
a317aa21be drm/nouveau/dma: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:11 +10:00
Ben Skeggs
fd166a1832 drm/nouveau/disp: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:11 +10:00
Ben Skeggs
e2f1cf253e drm/nouveau/cipher: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:11 +10:00
Ben Skeggs
d9261a6837 drm/nouveau/ce: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:11 +10:00
Ben Skeggs
d8c304b504 drm/nouveau/bsp: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:10 +10:00
Ben Skeggs
f0961867b8 drm/nouveau/xtensa: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:10 +10:00
Ben Skeggs
b26ada6fed drm/nouveau/falcon: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:10 +10:00
Ben Skeggs
6052dc5775 drm/nouveau/volt: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:10 +10:00
Ben Skeggs
cb8bb9cedb drm/nouveau/tmr: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:09 +10:00
Ben Skeggs
da06b46b72 drm/nouveau/therm: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:09 +10:00
Ben Skeggs
5a7d1e22fe drm/nouveau/pmu: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:09 +10:00
Ben Skeggs
2d9d5889e8 drm/nouveau/mxm: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:09 +10:00
Ben Skeggs
1f5bffca22 drm/nouveau/mmu: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:09 +10:00
Ben Skeggs
2ca0ddbc03 drm/nouveau/mc: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:09 +10:00
Ben Skeggs
c7750cfbc1 drm/nouveau/ltc: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:09 +10:00
Ben Skeggs
c44c06aeeb drm/nouveau/imem: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:08 +10:00
Ben Skeggs
ac51596f27 drm/nouveau/ibus: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:08 +10:00
Ben Skeggs
5b920d9264 drm/nouveau/i2c: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:08 +10:00
Ben Skeggs
e7d6518104 drm/nouveau/gpio: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:08 +10:00
Ben Skeggs
ce7b4f60a8 drm/nouveau/fuse: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:08 +10:00
Ben Skeggs
b1e4553cb1 drm/nouveau/fb: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:08 +10:00
Ben Skeggs
266f8b5ee6 drm/nouveau/devinit: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:07 +10:00
Ben Skeggs
3eca809b3c drm/nouveau/clk: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:07 +10:00
Ben Skeggs
01d6b95605 drm/nouveau/bus: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:07 +10:00
Ben Skeggs
a00014e396 drm/nouveau/bios: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:07 +10:00
Ben Skeggs
5b0c189fcb drm/nouveau/bar: cosmetic changes 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:07 +10:00
Ben Skeggs
9ace404b10 drm/nouveau/device: include core/device.h automatically for subdevs/engines 
Pretty much every subdev/engine is going to need access to nvkm_device
shortly to touch registers and/or output messages.

The odd placement of the includes is necessary to work around some
inter-dependencies that currently exist.  This will be fixed later.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:07 +10:00
Ben Skeggs
6d0d40e7a5 drm/nouveau/device: add direct pointer to struct device 
A future commit will hide the platform/pci specifics from nvkm_device,
but it's still very useful in a lot of places to have access to the
Linux device struct.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2015-08-28 12:40:06 +10:00