diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:20:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:20:57 +0200 |
| commit | fd2c17e1777d46cff14c25ea774a4d17459d188a (patch) | |
| tree | e8299216de8e99418195ba64bcf8f679df3a66b3 /net/sctp/socket.c | |
| parent | x86: add another PCI ID for ICH6 force hpet. (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-dev-fd2c17e1777d46cff14c25ea774a4d17459d188a.tar.xz linux-dev-fd2c17e1777d46cff14c25ea774a4d17459d188a.zip | |
Merge branch 'linus' into x86/timers
Diffstat (limited to 'net/sctp/socket.c')
0 files changed, 0 insertions, 0 deletions