]> 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)
commit35f334c0b933cd92aef7d63267137871d8a20a92
tree78faf49e78cd28f145b08ab579576021e24dc64c
parent5b98dcb3db097839c68220d1dc04b2dcd4e44899
parentf568453b3cb01dca7f6acd65b77a8159bb6a40ce
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