diff options
author | 2009-07-14 18:37:09 -0700 | |
---|---|---|
committer | 2009-07-14 18:37:09 -0700 | |
commit | d878fe2331219ff8518192b67f66699cb6d164e2 (patch) | |
tree | c3255588130a98256e56396c13c29e887fa1d6c1 /drivers/gpu/drm/drm_encoder_slave.c | |
parent | Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | mlx4_core: Add new ConnectX EN PCI ID 0x6764 (diff) | |
download | linux-rng-d878fe2331219ff8518192b67f66699cb6d164e2.tar.xz linux-rng-d878fe2331219ff8518192b67f66699cb6d164e2.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
mlx4_core: Add new ConnectX EN PCI ID 0x6764
mlx4_core: Handle multi-physical function devices
Diffstat (limited to 'drivers/gpu/drm/drm_encoder_slave.c')
0 files changed, 0 insertions, 0 deletions