Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2010 15:16:27 +0000 (07:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2010 15:16:27 +0000 (07:16 -0800)
commit970114a1dacf5f1f47aae9ad75c0abca42d8499c
tree4373412a410d5d61226dfb6a845b74e714a7c6e3
parentdef20529227a5c0938c374d11781bd0dbd5edee4
parent79f211b8e17205aae0304c58518fbc58506e52e3
Merge branch 'sh/for-2.6.33' of git://git./linux/kernel/git/lethal/sh-2.6

* 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh64: wire up sys_accept4.
  sh: unwire sys_recvmmsg.
  sh: ms7724: Correct sh-eth EEPROM polling timeout.