]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Jun 2008 15:35:44 +0000 (08:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Jun 2008 15:35:44 +0000 (08:35 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26:
  sh: Add defconfig for RSK7203.
  sh: Update SE7206 defconfig.
  sh: Disable 4KSTACKS on nommu.
  sh: fix miscompilation of ip_fast_csum with gcc >= 4.3
  sh: module.c use kernel unaligned helpers
  sh/kernel/cpu/irq/intc-sh5.c build fix


Trivial merge