r175244 - in /branches/google/main: ./ gcc/Chan...

[dnovillo@gcc.gnu.org]

Author: dnovillo
Date: Tue Jun 21 08:49:46 2011
New Revision: 175244

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=175244
Log:
	Merge from google/integration rev 175221.


Added:
    branches/google/main/gcc/config/arm/linux-grtev2.h
      - copied unchanged from r175149, branches/google/integration/gcc/config/arm/linux-grtev2.h
Modified:
    branches/google/main/   (props changed)
    branches/google/main/gcc/ChangeLog.google-integration
    branches/google/main/gcc/ChangeLog.google-main
    branches/google/main/gcc/config.gcc
    branches/google/main/gcc/config/arm/linux-eabi.h
    branches/google/main/gcc/config/arm/linux-elf.h
    branches/google/main/gcc/config/linux-grtev2.h
    branches/google/main/gcc/testsuite/gcc.target/powerpc/ppc-round.c   (props changed)
    branches/google/main/libjava/classpath/   (props changed)

Propchange: branches/google/main/
            ('svn:mergeinfo' modified)

Propchange: branches/google/main/
            ('svnmerge-integrated' modified)

Propchange: branches/google/main/gcc/testsuite/gcc.target/powerpc/ppc-round.c
            ('svn:mergeinfo' modified)

Propchange: branches/google/main/libjava/classpath/
            ('svn:mergeinfo' modified)