diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 16:16:27 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 16:16:27 +0100 |
| commit | 970114a1dacf5f1f47aae9ad75c0abca42d8499c (patch) | |
| tree | 4373412a410d5d61226dfb6a845b74e714a7c6e3 /mm | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | sh64: wire up sys_accept4. (diff) | |
| download | linux-970114a1dacf5f1f47aae9ad75c0abca42d8499c.tar.xz linux-970114a1dacf5f1f47aae9ad75c0abca42d8499c.zip | |
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.
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions