Merge from default.
authorDavid Given <dg@cowlark.com>
Sun, 8 Jan 2017 17:54:58 +0000 (18:54 +0100)
committerDavid Given <dg@cowlark.com>
Sun, 8 Jan 2017 17:54:58 +0000 (18:54 +0100)
1  2 
mach/proto/mcg/data.c
plat/qemuppc/descr

Simple merge
Simple merge