projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f72e6f4 9e5d135)
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Apr 2013 22:00:59 +0000 (15:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Apr 2013 22:00:59 +0000 (15:00 -0700)
commitc9ee3bf1f116e3f10ee7aaf90e0f53c3ad5b31ca
treed84bbe0148be0b5db17492c972234b5c28670ae3tree | snapshot
parentf72e6f468dee57415f9fcc85795529dfcda2c822commit | diff
parent9e5d135bd2994f576e713a16ab774abe46cccc8dcommit | 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."
Linux Kernel Source Tree.