diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-02 04:56:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-02 04:56:23 +0200 |
| commit | 829f51dbd825256197fb2a89705d42ad83f958ef (patch) | |
| tree | 78faf49e78cd28f145b08ab579576021e24dc64c /fs/affs | |
| parent | Merge tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6 (diff) | |
| parent | nls: fix (and rename) mac NLS table files and config options (diff) | |
| download | linux-829f51dbd825256197fb2a89705d42ad83f958ef.tar.xz linux-829f51dbd825256197fb2a89705d42ad83f958ef.zip | |
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
Diffstat (limited to 'fs/affs')
0 files changed, 0 insertions, 0 deletions