]> 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)
commit8a83be10c464305183049106a1809a486f12b9ee
treecad990f58f9ec6d400226dda86718fc10781416e
parent4c5158455c987373a6194f02ff14c32fef2e5dd5
parent828567cb53206247f3a2618e910582dce805f791
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