git.baikalelectronics.ru Git - kernel.git/commit

author	Roland Dreier <rolandd@cisco.com>
	Fri, 11 Sep 2009 04:19:45 +0000 (21:19 -0700)
committer	Roland Dreier <rolandd@cisco.com>
	Fri, 11 Sep 2009 04:19:45 +0000 (21:19 -0700)
commit	30739e5fd6559f29e4443db9c82b0edff767fb91
tree	9d84938e61970fcd56830009911e9b39b7eee478	tree \| snapshot
parent	daf99cfdaa8545585c65d117e27644cb0542d64d	commit \| diff
parent	a1e44ced47d106bcf3da7bad60d041f2de14f0d4	commit \| diff

Merge branch 'mad' into for-linus

Conflicts:
drivers/infiniband/core/mad.c