]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 024a6b9 273fca0)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 May 2010 20:34:20 +0000 (13:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 May 2010 20:34:20 +0000 (13:34 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Define ARCH_SLAB_MINALIGN
  drivers/sbus/char/flash.c: flash_read should update ppos instead of file->f_pos
  sparc64: Fix stack dumping and tracing when function graph is enabled.
  sparc64: Show stack backtrace from show_regs() just like other platforms.


Trivial merge
Linux kernel for KaRo TX COM modules