projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
804ce98
8b8c0da
)
Merge branch 'akpm' (Fixups for Andrew's patchbomb)
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 2 Jun 2012 02:56:23 +0000
(19:56 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 2 Jun 2012 02:56:23 +0000
(19:56 -0700)
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
Trivial merge