]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 May 2013 01:15:53 +0000 (11:15 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 May 2013 01:15:53 +0000 (11:15 +1000)
1  2 
drivers/i2c/busses/i2c-s3c2410.c
fs/nfs/nfs4proc.c

Simple merge
Simple merge