diff options
| author | Linus Torvalds <[email protected]> | 2008-04-17 01:58:37 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2008-04-17 01:58:37 +0000 |
| commit | c970d5a32ae1a90fba89892cc3432cf0b408cb8b (patch) | |
| tree | 1d8c3b5bf21249057efabfbb19abd63960a23a1d /net/ipv4/tcp_input.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| parent | it821x: do not describe noraid parameter with its value (diff) | |
| download | kernel-c970d5a32ae1a90fba89892cc3432cf0b408cb8b.tar.gz kernel-c970d5a32ae1a90fba89892cc3432cf0b408cb8b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
it821x: do not describe noraid parameter with its value
Pb1200/DBAu1200: fix bad IDE resource size
Au1200: IDE driver build fix
Au1200: kill IDE driver function prototypes
avr32 mustn't select HAVE_IDE
Diffstat (limited to 'net/ipv4/tcp_input.c')
0 files changed, 0 insertions, 0 deletions