1. 06 Jun, 2012 8 commits
  2. 05 Jun, 2012 5 commits
  3. 04 Jun, 2012 8 commits
  4. 02 Jun, 2012 17 commits
  5. 01 Jun, 2012 2 commits
    • Linus Torvalds's avatar
      Merge branch 'akpm' (Fixups for Andrew's patchbomb) · 829f51db
      Linus Torvalds authored
      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
      829f51db
    • Linus Torvalds's avatar
      nls: fix (and rename) mac NLS table files and config options · 8b8c0daa
      Linus Torvalds authored
      
      
      The config options in the Kconfig file (with _CODEPAGE_ in the name)
      didn't match the config option name in the Makefile (no _CODEPAGE_).
      
      And both of them were of the hard-to-read MACXYZZY variety, which made
      them hard to parse for normal humans: MACROMAN easily reads as "macro
      man", not as "Mac Roman".
      
      So rename the options to be consistent, and be NLS_MAC_xyzzy.  Rename
      the files to be mac-xyzzy.c too, and drop the "nls" part entirely (it's
      already in the directory name).
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8b8c0daa