| commit | 824282ca7d250bd7c301f221c3cd902ce906d731 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 22 15:00:59 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 22 15:00:59 2013 -0700 |
| tree | d84bbe0148be0b5db17492c972234b5c28670ae3 | |
| parent | f83b2933667b923d4e30ee04720e160438e26047 [diff] | |
| parent | 3b5e50edaf500f392f4a372296afc0b99ffa7e70 [diff] |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus Pull MIPS fix from Ralf Baechle: "Revert the change of the definition of PAGE_MASK which was prettier but broke a few relativly rare platforms" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: Revert "MIPS: page.h: Provide more readable definition for PAGE_MASK."