projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f83b293 3b5e50e)
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)
commit824282ca7d250bd7c301f221c3cd902ce906d731
treed84bbe0148be0b5db17492c972234b5c28670ae3tree | snapshot
parentf83b2933667b923d4e30ee04720e160438e26047commit | diff
parent3b5e50edaf500f392f4a372296afc0b99ffa7e70commit | diff
Merge branch 'upstream' of git://git.linux-mips.org/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."
John Crispins staging tree