| commit | 970114a1dacf5f1f47aae9ad75c0abca42d8499c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 21 07:16:27 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 21 07:16:27 2010 -0800 |
| tree | 4373412a410d5d61226dfb6a845b74e714a7c6e3 | |
| parent | def20529227a5c0938c374d11781bd0dbd5edee4 [diff] | |
| parent | 79f211b8e17205aae0304c58518fbc58506e52e3 [diff] |
Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/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.