Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Dec 2008 18:17:19 +0000 (10:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Dec 2008 18:17:19 +0000 (10:17 -0800)
commit2e8569669805c2d2620527464c395279b74892fc
tree16d8974c86dbea0972d1d9a4033b074ff188bde7
parent7ef5f41c16fdddfc14e882a57200334614d8ffd6
parented2b03ed3cec2a4719d04ef208319f9de6a4258a
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: MIPS64R2: Fix buggy __arch_swab64
  MIPS: Fix preprocessor warnings flaged by GCC 4.4