| commit | df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 17 13:39:52 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 17 13:39:52 2009 -0700 |
| tree | 109f3c3379e55948e4dea344a4d0ea59bd321f9d | |
| parent | c58afec8b2576b121eced7b94eb94eaf4626bacc [diff] | |
| parent | 87c62a66edd645a9b1ff1f9b00ab20c5a93d8845 [diff] |
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