projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 929675d 81e4807)
Merge branch 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Sep 2008 15:30:47 +0000 (08:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Sep 2008 15:30:47 +0000 (08:30 -0700)
* 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
  m32r/kernel/: cleanups
  m32r: export __ndelay
  m32r: export empty_zero_page
  m32r: don't offer CONFIG_ISA
  m32r: remove the unused NOHIGHMEM option


Trivial merge
John Crispins staging tree