]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: 4656545) | patch
fixed some merge errors
authorGuangyu Sun <guangyu.sun@oracle.com>
Tue, 3 Jul 2012 23:51:43 +0000 (16:51 -0700)
committerGuangyu Sun <guangyu.sun@oracle.com>
Tue, 3 Jul 2012 23:51:43 +0000 (16:51 -0700)
commitaad512a8bca0c010ecc477f58850fcf24a4f22fa
tree90d50b996dc7d71c9f3ccbb5992e83104d8b4e22tree
parent465654519273f731d2c49e0c1aed7c1d980ca255commit | diff
fixed some merge errors

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
block/scsi_ioctl.c diff | blob | history
drivers/infiniband/ulp/ipoib/ipoib_main.c diff | blob | history
drivers/infiniband/ulp/ipoib/ipoib_multicast.c diff | blob | history
net/ipv4/route.c diff | blob | history
net/sunrpc/svc_xprt.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.