r226803 [2/2] - in /branches/gomp-4_0-branch: ....

[tschwinge@gcc.gnu.org]

Propchange: branches/gomp-4_0-branch/
            ('svn:mergeinfo' modified)

Propchange: branches/gomp-4_0-branch/gcc/testsuite/c-c++-common/goacc/acc_on_device-2.c
            ('svn:mergeinfo' modified)

Propchange: branches/gomp-4_0-branch/libgomp/plugin/plugin-nvptx.c
            ('svn:mergeinfo' modified)