]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'misc' into for-next
authorRoland Dreier <rolandd@cisco.com>
Tue, 2 Mar 2010 07:52:31 +0000 (23:52 -0800)
committerRoland Dreier <rolandd@cisco.com>
Tue, 2 Mar 2010 07:52:31 +0000 (23:52 -0800)
commit2c6b36206a45950d46088f835b2b09f7cd059f82
tree786c31c1e86f5287177210fb469c8ecae0bdd146
parent45cca494f3022d9d9440f18e848b573c433af060
parent0cfb24bffd5e792f112111338384dd26d761e385
Merge branch 'misc' into for-next

Conflicts:
drivers/infiniband/core/uverbs_main.c
drivers/infiniband/core/uverbs_main.c
drivers/infiniband/hw/mlx4/qp.c