projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8348ad7 5df1abd)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jan 2011 23:02:55 +0000 (09:02 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jan 2011 23:02:55 +0000 (09:02 +1000)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/amiga: Fix "debug=mem"
  m68k/atari: Rename "scc" to "atari_scc"
  m68k: Uninline strchr()


Trivial merge
John Crispins staging tree