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)
Conflicts:
drivers/infiniband/core/uverbs_main.c


Trivial merge