[kernel: 84/85] Merge branch 'master' into baytrail

[Adam Williamson]

commit 7511bcf2e6ddc31ee27418487f2d4b7d93bed1e2
Merge: 187aae4 cd44fa8
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Nov 26 11:10:13 2014 -0800

    Merge branch 'master' into baytrail

 config-arm-generic   |    1 +
 config-armv7-generic |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)
---