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

Simple merge