Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Fix HPAGE_SIZE redefinition
This commit is contained in:
Linus Torvalds 2009-08-17 13:39:52 -07:00
commit df4ecf1524