]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Aug 2009 20:39:52 +0000 (13:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Aug 2009 20:39:52 +0000 (13:39 -0700)
commit35931f269e1d29fe147af7de214d34c94de147c6
tree109f3c3379e55948e4dea344a4d0ea59bd321f9d
parentc99c7a99e6829e65eb4cab956c5800201c1af8f4
parente3cefbb2b2492ca87d24f6ecf331be058bf920bc
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