]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'akpm' (Fixups for Andrew's patchbomb)
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Jun 2012 02:56:23 +0000 (19:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Jun 2012 02:56:23 +0000 (19:56 -0700)
commit960cae00f6409c1004fab5549a6ade49fb8cb094
tree78faf49e78cd28f145b08ab579576021e24dc64c
parent69e818b004febb07a56eab9d2f919063e7d3e644
parent7934930c46ee6d46bbb3956994d0e750d5d87909
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