From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 Jun 2012 02:56:23 +0000 (-0700)
Subject: Merge branch 'akpm' (Fixups for Andrew's patchbomb)
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=829f51dbd825256197fb2a89705d42ad83f958ef;p=openwrt%2Fstaging%2Fblogic.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