tree 786c31c1e86f5287177210fb469c8ecae0bdd146
parent f57721507ffeaf8785f7f17254651de4d8b45e09
parent a265e5587f078618c1f17c3a83da65046f18746f
author Roland Dreier <rolandd@cisco.com> 1267516351 -0800
committer Roland Dreier <rolandd@cisco.com> 1267516351 -0800

Merge branch 'misc' into for-next

Conflicts:
	drivers/infiniband/core/uverbs_main.c