| commit | 829f51dbd825256197fb2a89705d42ad83f958ef | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 01 19:56:23 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 01 19:56:23 2012 -0700 |
| tree | 78faf49e78cd28f145b08ab579576021e24dc64c | |
| parent | 804ce9866d56130032c9c8afc90a1297b7deed56 [diff] | |
| parent | 8b8c0daa2c5388b629e506f8fac486392f81c826 [diff] |
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