| commit | df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 17 Aug 2009 20:39:52 +0000 (17 13:39 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 17 Aug 2009 20:39:52 +0000 (17 13:39 -0700) | ||
| tree | 109f3c3379e55948e4dea344a4d0ea59bd321f9d | treesnapshot (tar.gz zip) |
| parent | c58afec8b2576b121eced7b94eb94eaf4626bacc | commitdiff |
| parent | 87c62a66edd645a9b1ff1f9b00ab20c5a93d8845 | commitdiff |
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
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Fix HPAGE_SIZE redefinition