Merge branch 'tmpalias-flush' into for-next
authorJames Bottomley <James.Bottomley@suse.de>
Thu, 10 Feb 2011 17:20:41 +0000 (11:20 -0600)
committerJames Bottomley <James.Bottomley@suse.de>
Thu, 10 Feb 2011 17:20:41 +0000 (11:20 -0600)
1  2 
arch/parisc/include/asm/pgtable.h

Simple merge