]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tmem/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Sep 2011 07:47:14 +0000 (17:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Sep 2011 07:47:14 +0000 (17:47 +1000)
1  2 
include/linux/swap.h

Simple merge