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)
commite9a623be5c984a1e344b2bb94e36e592f2491de6
tree01a50401f03fc89193261cd4737ace912b0d1047
parent6148a47ac3872092d4bc4888838bec6dff16654d
parent8b4ae3342dbcb6a0def3a7b3ae7aee633a81e758
Merge branch 'tmpalias-flush' into for-next
arch/parisc/include/asm/pgtable.h