]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit8a469d4b65059852b156231896988af84ff851e8
treed84bbe0148be0b5db17492c972234b5c28670ae3
parent069cb5f2eb38814358ed0ce589fdb6bc7c937e1e
parent677ec655785a3f4d5297f2f97c4ea5ae91ff2e8e
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."