Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorDavid S. Miller <davem@davemloft.net>
Tue, 9 Oct 2012 17:14:32 +0000 (13:14 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Oct 2012 17:14:32 +0000 (13:14 -0400)
commit8dd9117cc7a021ced1c5cf177e2d44dd92b88617
treecad990f58f9ec6d400226dda86718fc10781416e
parent16e310ae6ed352c4963b1f2413fcd88fa693eeda
parent547b1e81afe3119f7daf702cc03b158495535a25
Merge git://git./linux/kernel/git/torvalds/linux

Pulled mainline in order to get the UAPI infrastructure already
merged before I pull in David Howells's UAPI trees for networking.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/infiniband/core/cma.c