aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-02 21:05:35 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-02 21:05:35 -0700
commit52c4d73a6cca0db2927b60935e57429f98eae7c1 (patch)
tree2edd0d21e25ca0b044ba2e14425ccc21e07909f8 /Makefile
parentca9c5ffd9d12e136f72fa52840cda83485d586cd (diff)
parent841adfca9c5fc0fec6b1f0b2e5eb7a3b239a7730 (diff)
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 'Makefile')
0 files changed, 0 insertions, 0 deletions