Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
commitdf4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Aug 2009 20:39:52 +0000 (17 13:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Aug 2009 20:39:52 +0000 (17 13:39 -0700)
tree109f3c3379e55948e4dea344a4d0ea59bd321f9d
parentc58afec8b2576b121eced7b94eb94eaf4626bacc
parent87c62a66edd645a9b1ff1f9b00ab20c5a93d8845
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Fix HPAGE_SIZE redefinition