]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'vfs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 00:33:07 +0000 (10:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 00:33:07 +0000 (10:33 +1000)
1  2 
kernel/events/core.c
net/9p/trans_fd.c
net/socket.c

Simple merge
Simple merge
diff --cc net/socket.c
Simple merge