tree 78faf49e78cd28f145b08ab579576021e24dc64c
parent 804ce9866d56130032c9c8afc90a1297b7deed56
parent 8b8c0daa2c5388b629e506f8fac486392f81c826
author Linus Torvalds <torvalds@linux-foundation.org> 1338605783 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1338605783 -0700

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