diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-03 06:05:35 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-03 06:05:35 +0200 |
commit | 52c4d73a6cca0db2927b60935e57429f98eae7c1 (patch) | |
tree | 2edd0d21e25ca0b044ba2e14425ccc21e07909f8 /include/acpi/platform/aclinux.h | |
parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney... (diff) | |
parent | IPoIB/cm: Partial error clean up unmaps wrong address (diff) | |
download | linux-52c4d73a6cca0db2927b60935e57429f98eae7c1.tar.xz linux-52c4d73a6cca0db2927b60935e57429f98eae7c1.zip |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IPoIB/cm: Partial error clean up unmaps wrong address
mlx4_core: Add new Mellanox device IDs
Diffstat (limited to 'include/acpi/platform/aclinux.h')
0 files changed, 0 insertions, 0 deletions