]> 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, 31 Oct 2012 00:11:53 +0000 (11:11 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 00:11:53 +0000 (11:11 +1100)
1  2 
arch/alpha/kernel/osf_sys.c

Simple merge