tree 113083cdc724ed5b154c8119c1f625c51826067e
parent ca56a95eedcc95f8fea7b49c87565cd961d74fe2
parent 4d4d6fbb7c3125f17a4864215191e54b975cfb4f
author Linus Torvalds <torvalds@linux-foundation.org> 1309455784 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1309455784 -0700

Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x

* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x:
  ARM: mach-shmobile: make a struct in board-ap4evb.c static
  ARM: mach-shmobile: ag5evm: consistently name sdhi info structures
  ARM: mach-shmobile: mackerel: change usbhs devices order