diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-23 12:44:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-23 12:44:10 -0400 |
| commit | 6b426e785cb81e53dc2fc4dcf997661472b470ef (patch) | |
| tree | 3dbde895f120e78f66b32ddd9c9cbe3d83a59637 /net/sctp/socket.c | |
| parent | cb6aef2879b769644b35cffe9844c81c63809c8e (diff) | |
| parent | 223232de068593b40d267e340f24c017d31c018a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
[PARISC] MAINTAINERS
[PARISC] Make ioremap default to _nocache
[PARISC] Add new entries to the syscall table
[PARISC] Further work for multiple page sizes
[PARISC] Fix up hil_kbd.c mismerge
[PARISC] defconfig updates
[PARISC] Document that we tolerate "Relaxed Ordering"
[PARISC] Misc. janitorial work
[PARISC] EISA regions must be mapped NO_CACHE
[PARISC] OSS ad1889: Match register names with ALSA driver
Diffstat (limited to 'net/sctp/socket.c')
0 files changed, 0 insertions, 0 deletions