diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-04 06:58:41 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-04 06:58:41 +0100 |
commit | 6edacf05c8362f4c368991b55d85e8122cfc9a24 (patch) | |
tree | 707dda607c42ec5f618b1fe6166775e9af8dd1f8 /fs/nilfs2 | |
parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
parent | powerpc/mm: Fix hash computation function (diff) | |
download | linux-6edacf05c8362f4c368991b55d85e8122cfc9a24.tar.xz linux-6edacf05c8362f4c368991b55d85e8122cfc9a24.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc update from Benjamin Herrenschmidt:
"Just so that you don't get too bored on your Island here's a patch for
3.8 fixing a nasty bug that affects the new 64T support that was
merged in 3.7. Please apply whenever you have a chance (and an
internet connection!)"
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/mm: Fix hash computation function
Diffstat (limited to 'fs/nilfs2')
0 files changed, 0 insertions, 0 deletions