Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
commit427e3df6f22f919134adec42e5c9c889b7397196
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jun 2011 17:43:04 +0000 (30 10:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jun 2011 17:43:04 +0000 (30 10:43 -0700)
tree113083cdc724ed5b154c8119c1f625c51826067e
parentca56a95eedcc95f8fea7b49c87565cd961d74fe2
parent4d4d6fbb7c3125f17a4864215191e54b975cfb4f
Merge branch 'rmobile-fixes-for-linus' of git://git./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