]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 03:50:23 +0000 (13:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 03:50:23 +0000 (13:50 +1000)
1  2 
fs/eventpoll.c

diff --cc fs/eventpoll.c
Simple merge