projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edb1e96 8a177c4)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Sep 2007 04:15:36 +0000 (21:15 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Sep 2007 04:15:36 +0000 (21:15 -0700)
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Warn user if cpu is ignored.
  [SPARC64]: Fix lockdep, particularly on SMP.
  [SPARC64]: Update defconfig.


Trivial merge
John Crispins staging tree