Two merge window fallout build fixes, please pull, thanks a lot! The following changes since commit 2d3c627502f2a9b0a7de06a5a2df2365542a72c9: Revert "init/Kconfig: add option to disable kernel compression" (2013-11-17 11:17:36 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git master for you to fetch changes up to 6a328f3fe042396c6525d7bf84cfd941440cc045: sparc64: merge fix (2013-11-18 15:08:52 -0800) ---------------------------------------------------------------- Kirill A. Shutemov (1): sparc64: fix build regession Stephen Rothwell (1): sparc64: merge fix arch/sparc/include/asm/tlbflush_64.h | 1 - arch/sparc/mm/init_64.c | 2 -- 2 files changed, 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html