]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit884991f4868cc184c2aa4fd1c01435096784f798
treecad990f58f9ec6d400226dda86718fc10781416e
parent536f551a068d482d436f88d09d68afbae8e10ee1
parentfc5f70f1b06f406fd137f7b4d3e991cdb3280c32
Merge git://git.kernel.org/pub/scm/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