tree 3f2471b2452467b50c80cd61b12f708b2df39e0e
parent c09c2d1089b55a3da7058a2f1a76c2f21c8b0688
parent a79aebfca1e597c1aab4b8e327028f96f5ea9095
author Linus Torvalds <torvalds@linux-foundation.org> 1253889854 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253889854 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge
  sh: Add support DMA Engine to SH7780
  sh: Add support DMA Engine to SH7722
  sh: enable onenand support in kfr2r09 defconfig.
  sh: update defconfigs.
  sh: add FSI driver support for ms7724se
  sh: Fix up uninitialized variable use caught by gcc 4.4.
  sh: Handle unaligned 16-bit instructions on SH-2A.
  sh: mach-ecovec24: Add active low setting for sh_eth
  sh: includecheck fix: dwarf.c