]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'vfs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 00:40:07 +0000 (10:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 00:40:07 +0000 (10:40 +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