]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16e310a 547b1e8)
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)
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>
1  2 
drivers/infiniband/core/cma.c patch | diff1 | diff2 | blob | history

diff --cc drivers/infiniband/core/cma.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.