[beignet] 01/02: Merge branch 'master' into jessie-backports

[Rebecca Palmer]

This is an automated email from the git hooks/post-receive script.

rnpalmer-guest pushed a commit to branch jessie-backports
in repository beignet.

commit 343693e5f3d45cfc7a1ec53f5e9ee3467d4913a0
Merge: 527ae16 487bfd6
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Tue Jun 28 21:50:49 2016 +0100

    Merge branch 'master' into jessie-backports
    
    Conflicts:
    	debian/changelog

 debian/beignet-dev.doc-base                    |   7 +
 debian/beignet-dev.docs                        |   1 +
 debian/beignet-opencl-icd.README.Debian        |  20 +++
 debian/beignet-opencl-icd.docs                 |   1 -
 debian/changelog                               |  12 +-
 debian/clean                                   |   1 +
 debian/control                                 |   9 +-
 debian/patches/noassert-missing-function.patch | 182 +++++++++++++++++++++++++
 debian/patches/profiling-32on64.patch          |  40 ++++++
 debian/patches/series                          |   2 +
 debian/patches/update-docs.patch               |  33 ++++-
 debian/rules                                   |   5 +
 12 files changed, 302 insertions(+), 11 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git