]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 1 Aug 2011 02:42:46 +0000 (12:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 1 Aug 2011 02:42:46 +0000 (12:42 +1000)
1  2 
fs/eventpoll.c

diff --cc fs/eventpoll.c
Simple merge