diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 09:37:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 09:37:57 -0700 |
| commit | ad4ba059005f18ec9e274966c16d99fc5ce8b2cd (patch) | |
| tree | 4ac79d10d435c778dbc712146732044be9d3af82 /net/lapb/lapb_subr.c | |
| parent | frv/chris: fix lines with a missing semicolons (diff) | |
| parent | Revert "ide: skip probe if there are no devices on the port (v2)" (diff) | |
| download | linux-dev-ad4ba059005f18ec9e274966c16d99fc5ce8b2cd.tar.xz linux-dev-ad4ba059005f18ec9e274966c16d99fc5ce8b2cd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
Revert "ide: skip probe if there are no devices on the port (v2)"
Revert "via82cxxx: workaround h/w bugs"
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions