From: Linus Torvalds Date: Sat, 2 Jun 2012 02:56:23 +0000 (-0700) Subject: Merge branch 'akpm' (Fixups for Andrew's patchbomb) X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=829f51dbd825256197fb2a89705d42ad83f958ef;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'akpm' (Fixups for Andrew's patchbomb) Merge fixups for the mac NLS tables from Andrew. * emailed from Andrew Morton, and one cleanup by me: nls: fix (and rename) mac NLS table files and config options fs/nls/Makefile: remove bogus CONFIG_ assignments --- 829f51dbd825256197fb2a89705d42ad83f958ef